diff --git a/r8.jar b/r8.jar
index 566ccc7..b84342f 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ
diff --git a/r8.jar.map b/r8.jar.map
index 8fc60a6..0833df1 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,10 +1,10 @@
 # compiler: R8
-# compiler_version: 3.3.17-dev
+# compiler_version: 3.3.16-dev
 # compiler_hash: engineering
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"2.0"}
-# pg_map_id: 3.3.17-dev
-# pg_map_hash: SHA-256 8597bdcddb625a75448e1377b78ee88c9003096125506aab9f8ea1ec38c40eb3
+# pg_map_id: 3.3.16-dev
+# pg_map_hash: SHA-256 7f39e7dad5f45619310455516cbd72c96003490140d1c8e3e0776075d2c10344
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.i2:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():10:10 -> <clinit>
@@ -22,13 +22,13 @@
     6:6:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24 -> a
     7:9:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):24:26 -> a
     10:10:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":14,"2":15,"3":16,"4":17,"5":18,"6":19}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11,"2":12,"3":13,"4":14,"5":15,"6":16}}
+    11:11:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
+    12:12:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
+    13:13:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
     14:14:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
     15:15:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
     16:16:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
-    17:17:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
-    18:18:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
-    19:19:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):28:28 -> a
 com.android.tools.r8.ArchiveClassFileProvider -> com.android.tools.r8.ArchiveClassFileProvider:
     com.android.tools.r8.origin.Origin origin -> b
     java.util.Set descriptors -> d
@@ -214,7 +214,8 @@
     3:5:com.android.tools.r8.utils.InternalOptions getInternalOptions():107:109 -> b
     6:6:com.android.tools.r8.utils.AndroidApp getInputApp():75:75 -> b
     6:6:com.android.tools.r8.utils.InternalOptions getInternalOptions():109 -> b
-    7:7:com.android.tools.r8.utils.InternalOptions getInternalOptions():109:109 -> b
+    7:13:void com.android.tools.r8.utils.InternalOptions.setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp):894:900 -> b
+    7:13:com.android.tools.r8.utils.InternalOptions getInternalOptions():109 -> b
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder builder():114:114 -> builder
     2:2:com.android.tools.r8.BackportedMethodListCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):118:118 -> builder
     1:1:com.android.tools.r8.utils.Reporter getReporter():59:59 -> c
@@ -231,51 +232,51 @@
     475:475:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:134 -> parse
     147:147:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:134 -> parse
     148:148:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):0:0 -> parse
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":476,"2":477,"3":478}}
-    476:476:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:134 -> parse
-    477:477:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:134 -> parse
-    478:478:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:134 -> parse
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":473,"2":474,"3":475}}
+    473:473:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:134 -> parse
+    474:474:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:134 -> parse
+    475:475:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:134 -> parse
     282:292:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):134:144 -> parse
     293:299:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):165:171 -> parse
     293:299:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
     300:300:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):0:0 -> parse
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":479,"2":480,"3":481,"4":482,"5":483}}
-    479:479:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
-    479:479:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
-    480:480:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
-    480:480:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
-    481:481:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
-    481:481:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
-    482:482:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
-    482:482:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
-    483:483:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
-    483:483:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":473,"2":474,"3":475,"4":476,"5":477}}
+    473:473:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
+    473:473:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+    474:474:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
+    474:474:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+    475:475:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
+    475:475:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+    476:476:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
+    476:476:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+    477:477:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:171 -> parse
+    477:477:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
     301:304:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):171:174 -> parse
     301:304:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
     305:305:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
     305:305:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
     306:306:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):0:0 -> parse
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":484,"2":485,"3":486,"4":487,"5":488}}
-    484:484:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
-    484:484:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
-    485:485:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
-    485:485:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
-    486:486:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
-    486:486:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
-    487:487:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
-    487:487:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
-    488:488:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
-    488:488:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":473,"2":474,"3":475,"4":476,"5":477}}
+    473:473:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
+    473:473:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+    474:474:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
+    474:474:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+    475:475:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
+    475:475:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+    476:476:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
+    476:476:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
+    477:477:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
+    477:477:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
     307:307:void parseMinApi(com.android.tools.r8.BackportedMethodListCommand$Builder,java.lang.String):167:167 -> parse
     307:307:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):146 -> parse
     308:315:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):149:156 -> parse
     316:316:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):0:0 -> parse
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":489,"2":490,"3":491,"4":492,"5":493}}
-    489:489:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
-    490:490:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
-    491:491:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
-    492:492:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
-    493:493:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":473,"2":474,"3":475,"4":476,"5":477}}
+    473:473:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
+    474:474:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
+    475:475:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
+    476:476:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
+    477:477:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
     472:472:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
 com.android.tools.r8.BackportedMethodListCommand$Builder -> com.android.tools.r8.BackportedMethodListCommand$Builder:
     java.util.List desugaredLibrarySpecificationResources -> c
@@ -412,10 +413,10 @@
     1:2:void <init>(java.lang.String,java.nio.file.Path):75:76 -> <init>
     1:1:java.lang.String part():81:81 -> part
     2:2:java.lang.String part():0:0 -> part
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":83,"2":84,"3":85}}
-    83:83:java.lang.String part():81:81 -> part
-    84:84:java.lang.String part():81:81 -> part
-    85:85:java.lang.String part():81:81 -> part
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5}}
+    3:3:java.lang.String part():81:81 -> part
+    4:4:java.lang.String part():81:81 -> part
+    5:5:java.lang.String part():81:81 -> part
 com.android.tools.r8.BaseCommand$LibraryInputOrigin -> com.android.tools.r8.e:
     1:1:void <init>(java.nio.file.Path):95:95 -> <init>
 com.android.tools.r8.BaseCommand$ProgramInputOrigin -> com.android.tools.r8.f:
@@ -811,67 +812,65 @@
     55:55:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> a
     55:55:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):377 -> a
     56:75:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):378:397 -> a
-    76:76:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():269:269 -> a
+    76:76:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():259:259 -> a
     76:76:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.naming.NamingLens):397 -> a
     77:79:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):403:405 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):124:124 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):162:164 -> c
     1:6:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):181:186 -> d
     7:7:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":780,"2":781,"3":782}}
-    780:780:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
-    781:781:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
-    782:782:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":776,"2":777,"3":778}}
+    776:776:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
+    777:777:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
+    778:778:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:186 -> d
     193:194:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):186:187 -> d
     195:195:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":783,"2":784,"3":785}}
-    783:783:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
-    784:784:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
-    785:785:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":776,"2":777,"3":778}}
+    776:776:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
+    777:777:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
+    778:778:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:187 -> d
     382:383:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):187:188 -> d
     384:384:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":786,"2":787,"3":788}}
-    786:786:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
-    787:787:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
-    788:788:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":776,"2":777,"3":778}}
+    776:776:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
+    777:777:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
+    778:778:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:188 -> d
     572:580:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):188:196 -> d
     581:581:boolean com.android.tools.r8.utils.AssertionUtils.forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> d
     581:581:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):196 -> d
     582:582:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):196:196 -> d
     583:587:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):172:176 -> d
     583:587:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):198 -> d
-    588:591:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):30:33 -> d
-    588:591:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):199 -> d
-    592:592:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):29:29 -> d
-    592:592:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):199 -> d
-    593:604:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):200:211 -> d
-    605:661:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):210:266 -> d
-    662:665:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):29:32 -> d
-    662:665:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):266 -> d
-    666:666:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):267:267 -> d
-    667:672: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):25:30 -> d
-    667:672:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):267 -> d
-    673:673:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> d
-    673:673:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):269 -> d
-    674:674:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):341:341 -> d
-    674:674:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270 -> d
-    675:675:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271:271 -> d
-    676:676:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():497:497 -> d
-    676:676:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):272 -> d
-    677:698:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):272:293 -> d
-    699:711:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):287:299 -> d
-    712:716:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):296:300 -> d
-    717:718:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276:277 -> d
-    719:719:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> d
-    719:719:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):277 -> d
-    720:752:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):278:310 -> d
-    753:755:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):309:311 -> d
-    756:756:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):341:341 -> d
-    756:756:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):313 -> d
-    757:772:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):315:330 -> d
-    773:773:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
-    773:773:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):325 -> d
-    774:779:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):325:330 -> d
+    588:588:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):24:24 -> d
+    588:588:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):199 -> d
+    589:600:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):200:211 -> d
+    601:657:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):210:266 -> d
+    658:661:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):29:32 -> d
+    658:661:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):266 -> d
+    662:662:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):267:267 -> d
+    663:668: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):25:30 -> d
+    663:668:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):267 -> d
+    669:669:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> d
+    669:669:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):269 -> d
+    670:670:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):341:341 -> d
+    670:670:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270 -> d
+    671:671:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271:271 -> d
+    672:672:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():496:496 -> d
+    672:672:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):272 -> d
+    673:694:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):272:293 -> d
+    695:707:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):287:299 -> d
+    708:712:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):296:300 -> d
+    713:714:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276:277 -> d
+    715:715:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> d
+    715:715:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):277 -> d
+    716:748:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):278:310 -> d
+    749:751:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):309:311 -> d
+    752:752:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):341:341 -> d
+    752:752:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):313 -> d
+    753:768:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):315:330 -> d
+    769:769:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
+    769:769:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):325 -> d
+    770:775:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):325:330 -> d
     1:4:void main(java.lang.String[]):149:152 -> main
     5:5:void main(java.lang.String[]):150:150 -> main
     1:5:void run(com.android.tools.r8.D8Command):97:101 -> run
@@ -904,21 +903,24 @@
     30:40:void <init>(boolean,boolean):435:445 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):349:349 -> a
     1:4:com.android.tools.r8.utils.InternalOptions getInternalOptions():450:453 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     5:5:com.android.tools.r8.utils.InternalOptions getInternalOptions():454 -> b
     6:14:com.android.tools.r8.utils.InternalOptions getInternalOptions():455:463 -> b
-    15:62:com.android.tools.r8.utils.InternalOptions getInternalOptions():462:509 -> b
-    63:63:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):97:97 -> b
-    63:63:com.android.tools.r8.utils.InternalOptions getInternalOptions():509 -> b
-    64:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():509:522 -> b
-    78:78:com.android.tools.r8.DumpOptions dumpOptions():529:529 -> b
-    78:78:com.android.tools.r8.utils.InternalOptions getInternalOptions():523 -> b
-    79:83:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):128:132 -> b
-    79:83:com.android.tools.r8.DumpOptions dumpOptions():530 -> b
-    79:83:com.android.tools.r8.utils.InternalOptions getInternalOptions():523 -> b
-    84:88:com.android.tools.r8.DumpOptions dumpOptions():531:535 -> b
-    84:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():523 -> b
-    89:89:com.android.tools.r8.utils.InternalOptions getInternalOptions():523:523 -> b
+    15:54:com.android.tools.r8.utils.InternalOptions getInternalOptions():462:501 -> b
+    55:61:void com.android.tools.r8.utils.InternalOptions.setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp):894:900 -> b
+    55:61:com.android.tools.r8.utils.InternalOptions getInternalOptions():501 -> b
+    62:68:com.android.tools.r8.utils.InternalOptions getInternalOptions():503:509 -> b
+    69:69:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):97:97 -> b
+    69:69:com.android.tools.r8.utils.InternalOptions getInternalOptions():509 -> b
+    70:83:com.android.tools.r8.utils.InternalOptions getInternalOptions():509:522 -> b
+    84:84:com.android.tools.r8.DumpOptions dumpOptions():529:529 -> b
+    84:84:com.android.tools.r8.utils.InternalOptions getInternalOptions():523 -> b
+    85:89:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):128:132 -> b
+    85:89:com.android.tools.r8.DumpOptions dumpOptions():530 -> b
+    85:89:com.android.tools.r8.utils.InternalOptions getInternalOptions():523 -> b
+    90:94:com.android.tools.r8.DumpOptions dumpOptions():531:535 -> b
+    90:94:com.android.tools.r8.utils.InternalOptions getInternalOptions():523 -> b
+    95:95:com.android.tools.r8.utils.InternalOptions getInternalOptions():523:523 -> b
     1:1:com.android.tools.r8.D8Command$Builder builder():340:340 -> builder
     2:2:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):344:344 -> builder
     1:1:com.android.tools.r8.D8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):362:362 -> parse
@@ -1092,7 +1094,7 @@
     1:6:com.android.tools.r8.DataEntryResource fromString(java.lang.String,com.android.tools.r8.origin.Origin,java.lang.String[]):30:35 -> fromString
     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$ByteDataEntryResource -> com.android.tools.r8.internal.me:
+com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.internal.le:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> c
     java.lang.String name -> b
@@ -1110,7 +1112,7 @@
     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.ne:
+com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.me:
     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>
@@ -1584,16 +1586,16 @@
     26:26:void main(java.lang.String[]):111 -> main
     27:48:void main(java.lang.String[]):112:133 -> main
     49:49:void main(java.lang.String[]):0:0 -> main
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":619,"2":620,"3":621}}
-    619:619:void main(java.lang.String[]):133:133 -> main
-    620:620:void main(java.lang.String[]):133:133 -> main
-    621:621:void main(java.lang.String[]):133:133 -> main
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":614,"2":615,"3":616}}
+    614:614:void main(java.lang.String[]):133:133 -> main
+    615:615:void main(java.lang.String[]):133:133 -> main
+    616:616:void main(java.lang.String[]):133:133 -> main
     182:183:void main(java.lang.String[]):133:134 -> main
     184:184:void main(java.lang.String[]):0:0 -> main
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":622,"2":623,"3":624}}
-    622:622:void main(java.lang.String[]):134:134 -> main
-    623:623:void main(java.lang.String[]):134:134 -> main
-    624:624:void main(java.lang.String[]):134:134 -> main
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":614,"2":615,"3":616}}
+    614:614:void main(java.lang.String[]):134:134 -> main
+    615:615:void main(java.lang.String[]):134:134 -> main
+    616:616:void main(java.lang.String[]):134:134 -> main
     185:191:int extractDexSize(java.nio.file.Path):58:64 -> main
     185:191:void main(java.lang.String[]):134 -> main
     192:192:void $closeResource(java.lang.Throwable,java.lang.AutoCloseable):65:65 -> main
@@ -1608,10 +1610,10 @@
     195:195:void main(java.lang.String[]):134 -> main
     196:216:void main(java.lang.String[]):134:154 -> main
     217:217:void main(java.lang.String[]):0:0 -> main
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":644,"2":645,"3":646}}
-    644:644:void main(java.lang.String[]):154:154 -> main
-    645:645:void main(java.lang.String[]):154:154 -> main
-    646:646:void main(java.lang.String[]):154:154 -> main
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":614,"2":615,"3":616}}
+    614:614:void main(java.lang.String[]):154:154 -> main
+    615:615:void main(java.lang.String[]):154:154 -> main
+    616:616:void main(java.lang.String[]):154:154 -> main
     371:374:void main(java.lang.String[]):154:157 -> main
     375:381:int extractDexSize(java.nio.file.Path):58:64 -> main
     375:381:void main(java.lang.String[]):157 -> main
@@ -1629,12 +1631,12 @@
     395:397:void main(java.lang.String[]):129:129 -> main
     436:440:void main(java.lang.String[]):168:172 -> main
     441:441:void main(java.lang.String[]):0:0 -> main
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":664,"2":665,"3":666}}
-    664:664:void main(java.lang.String[]):172:172 -> main
-    665:665:void main(java.lang.String[]):172:172 -> main
-    666:666:void main(java.lang.String[]):172:172 -> main
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":614,"2":615,"3":616}}
+    614:614:void main(java.lang.String[]):172:172 -> main
+    615:615:void main(java.lang.String[]):172:172 -> main
+    616:616:void main(java.lang.String[]):172:172 -> main
     613:613:void main(java.lang.String[]):172:172 -> main
-com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.internal.sj:
+com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.internal.nj:
     int index -> f
     1:2:void <init>(com.android.tools.r8.origin.Origin,int):35:36 -> <init>
     1:1:java.lang.String part():41:41 -> part
@@ -1819,24 +1821,24 @@
     1:1:void decreaseIndent():624:624 -> a
     1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> a
     2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"3":10}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"3":11}}
     9:9:void decreaseIndent():624:624 -> a
     9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> a
-    10:10:void decreaseIndent():624:624 -> a
-    10:10:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> a
+    11:11:void decreaseIndent():624:624 -> a
+    11:11:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> a
     3:3:void decreaseIndent():624:624 -> a
     3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> a
     4:4:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):415:415 -> a
     4:4:void decreaseIndent():625 -> a
     4:4:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):650 -> a
     5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11,"2":12,"3":13,"4":14,"5":15,"6":16}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"2":10,"3":11,"4":12,"5":13,"6":14}}
+    9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> a
+    10:10:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> a
     11:11:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> a
     12:12:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> a
     13:13:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> a
     14:14:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> a
-    15:15:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> a
-    16:16:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651:651 -> a
     6:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):420:422 -> a
     6:8:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):651 -> a
     1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):0:0 -> b
@@ -1852,13 +1854,13 @@
     5:5:void increaseIndent():619:619 -> b
     5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> b
     6:6:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15,"2":16,"3":17}}
-    15:15:void increaseIndent():619:619 -> b
-    15:15:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> b
-    16:16:void increaseIndent():619:619 -> b
-    16:16:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> b
-    17:17:void increaseIndent():619:619 -> b
-    17:17:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"2":10,"3":11}}
+    9:9:void increaseIndent():619:619 -> b
+    9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> b
+    10:10:void increaseIndent():619:619 -> b
+    10:10:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> b
+    11:11:void increaseIndent():619:619 -> b
+    11:11:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> b
     7:7:void increaseIndent():619:619 -> b
     7:7:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):645 -> b
     8:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):415:415 -> b
@@ -1961,19 +1963,19 @@
     21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):491:491 -> toString
     21:21:java.lang.String toString():677 -> toString
     22:22:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":149,"2":150,"3":151,"4":152,"5":153,"6":154}}
-    149:149:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
-    149:149:java.lang.String toString():677 -> toString
-    150:150:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
-    150:150:java.lang.String toString():677 -> toString
-    151:151:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
-    151:151:java.lang.String toString():677 -> toString
-    152:152:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
-    152:152:java.lang.String toString():677 -> toString
-    153:153:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
-    153:153:java.lang.String toString():677 -> toString
-    154:154:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
-    154:154:java.lang.String toString():677 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":143,"2":144,"3":145,"4":146,"5":147,"6":148}}
+    143:143:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    143:143:java.lang.String toString():677 -> toString
+    144:144:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    144:144:java.lang.String toString():677 -> toString
+    145:145:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    145:145:java.lang.String toString():677 -> toString
+    146:146:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    146:146:java.lang.String toString():677 -> toString
+    147:147:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    147:147:java.lang.String toString():677 -> toString
+    148:148:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629:629 -> toString
+    148:148:java.lang.String toString():677 -> toString
     23:25:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):420:422 -> toString
     23:25:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):629 -> toString
     23:25:java.lang.String toString():677 -> toString
@@ -1996,19 +1998,19 @@
     49:49:java.lang.String toString():685 -> toString
     50:52:java.lang.String toString():685:687 -> toString
     53:53:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":155,"2":156,"3":157,"4":158,"5":159,"6":160}}
-    155:155:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    155:155:java.lang.String toString():682 -> toString
-    156:156:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    156:156:java.lang.String toString():682 -> toString
-    157:157:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    157:157:java.lang.String toString():682 -> toString
-    158:158:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    158:158:java.lang.String toString():682 -> toString
-    159:159:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    159:159:java.lang.String toString():682 -> toString
-    160:160:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    160:160:java.lang.String toString():682 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":143,"2":144,"3":145,"4":146,"5":147,"6":148}}
+    143:143:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    143:143:java.lang.String toString():682 -> toString
+    144:144:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    144:144:java.lang.String toString():682 -> toString
+    145:145:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    145:145:java.lang.String toString():682 -> toString
+    146:146:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    146:146:java.lang.String toString():682 -> toString
+    147:147:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    147:147:java.lang.String toString():682 -> toString
+    148:148:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    148:148:java.lang.String toString():682 -> toString
     54:56:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):420:422 -> toString
     54:56:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639 -> toString
     54:56:java.lang.String toString():682 -> toString
@@ -2025,19 +2027,19 @@
     72:72:java.lang.String toString():695 -> toString
     73:74:java.lang.String toString():695:696 -> toString
     75:75:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163,"4":164,"5":165,"6":166}}
-    161:161:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    161:161:java.lang.String toString():692 -> toString
-    162:162:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    162:162:java.lang.String toString():692 -> toString
-    163:163:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    163:163:java.lang.String toString():692 -> toString
-    164:164:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    164:164:java.lang.String toString():692 -> toString
-    165:165:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    165:165:java.lang.String toString():692 -> toString
-    166:166:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    166:166:java.lang.String toString():692 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":143,"2":144,"3":145,"4":146,"5":147,"6":148}}
+    143:143:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    143:143:java.lang.String toString():692 -> toString
+    144:144:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    144:144:java.lang.String toString():692 -> toString
+    145:145:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    145:145:java.lang.String toString():692 -> toString
+    146:146:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    146:146:java.lang.String toString():692 -> toString
+    147:147:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    147:147:java.lang.String toString():692 -> toString
+    148:148:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    148:148:java.lang.String toString():692 -> toString
     76:78:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):420:422 -> toString
     76:78:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639 -> toString
     76:78:java.lang.String toString():692 -> toString
@@ -2060,37 +2062,37 @@
     101:101:java.lang.String toString():705 -> toString
     102:105:java.lang.String toString():705:708 -> toString
     106:106:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":167,"2":168,"3":169,"4":170,"5":171,"6":172}}
-    167:167:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    167:167:java.lang.String toString():702 -> toString
-    168:168:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    168:168:java.lang.String toString():702 -> toString
-    169:169:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    169:169:java.lang.String toString():702 -> toString
-    170:170:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    170:170:java.lang.String toString():702 -> toString
-    171:171:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    171:171:java.lang.String toString():702 -> toString
-    172:172:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
-    172:172:java.lang.String toString():702 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":143,"2":144,"3":145,"4":146,"5":147,"6":148}}
+    143:143:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    143:143:java.lang.String toString():702 -> toString
+    144:144:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    144:144:java.lang.String toString():702 -> toString
+    145:145:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    145:145:java.lang.String toString():702 -> toString
+    146:146:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    146:146:java.lang.String toString():702 -> toString
+    147:147:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    147:147:java.lang.String toString():702 -> toString
+    148:148:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639:639 -> toString
+    148:148:java.lang.String toString():702 -> toString
     107:109:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):420:422 -> toString
     107:109:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):639 -> toString
     107:109:java.lang.String toString():702 -> toString
     110:136:java.lang.String toString():709:735 -> toString
     137:137:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":173,"2":174,"3":175,"4":176,"5":177,"6":178}}
-    173:173:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
-    173:173:java.lang.String toString():735 -> toString
-    174:174:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
-    174:174:java.lang.String toString():735 -> toString
-    175:175:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
-    175:175:java.lang.String toString():735 -> toString
-    176:176:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
-    176:176:java.lang.String toString():735 -> toString
-    177:177:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
-    177:177:java.lang.String toString():735 -> toString
-    178:178:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
-    178:178:java.lang.String toString():735 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":143,"2":144,"3":145,"4":146,"5":147,"6":148}}
+    143:143:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    143:143:java.lang.String toString():735 -> toString
+    144:144:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    144:144:java.lang.String toString():735 -> toString
+    145:145:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    145:145:java.lang.String toString():735 -> toString
+    146:146:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    146:146:java.lang.String toString():735 -> toString
+    147:147:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    147:147:java.lang.String toString():735 -> toString
+    148:148:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634:634 -> toString
+    148:148:java.lang.String toString():735 -> toString
     138:140:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):420:422 -> toString
     138:140:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):634 -> toString
     138:140:java.lang.String toString():735 -> toString
@@ -2122,7 +2124,7 @@
     1:1:void <init>():412:412 -> <init>
     2:4:void <init>():408:410 -> <init>
     1:1:java.lang.String toString():433:433 -> toString
-com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.Fl:
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.Al:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
     1:3:void <init>(java.util.Set,java.util.Map):209:211 -> <init>
@@ -2289,70 +2291,67 @@
     32:38:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):100:106 -> a
     39:48:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):128:137 -> a
     39:48:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    49:52:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):30:33 -> a
-    49:52:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138 -> a
-    49:52:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    53:53:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):29:29 -> a
-    53:53:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138 -> a
-    53:53:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    54:58:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):140:144 -> a
-    54:58:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    59:59:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):317:317 -> a
-    59:59:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144 -> a
-    59:59:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    60:64:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144:148 -> a
-    60:64:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    65:65:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):24:24 -> a
-    65:65:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):148 -> a
-    65:65:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    66:69:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):29:32 -> a
-    66:69:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):24 -> a
-    66:69:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):148 -> a
-    66:69:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    70:70:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149:149 -> a
-    70:70:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    71:71:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> a
-    71:71:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149 -> a
+    49:49:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):24:24 -> a
+    49:49:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):138 -> a
+    49:49:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    50:54:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):140:144 -> a
+    50:54:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    55:55:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):315:315 -> a
+    55:55:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144 -> a
+    55:55:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    56:60:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):144:148 -> a
+    56:60:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    61:61:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):24:24 -> a
+    61:61:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):148 -> a
+    61:61:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    62:65:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):29:32 -> a
+    62:65:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):24 -> a
+    62:65:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):148 -> a
+    62:65:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    66:66:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149:149 -> a
+    66:66:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    67:67:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):31:31 -> a
+    67:67:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149 -> a
+    67:67:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    68:70:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149:151 -> a
+    68:70:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    71:71:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():496:496 -> a
+    71:71:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):152 -> a
     71:71:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    72:74:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149:151 -> a
-    72:74:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    75:75:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():497:497 -> a
-    75:75:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):152 -> a
-    75:75:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    76:84:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):152:160 -> a
-    76:84:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    85:88:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):110:113 -> a
-    89:89:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
-    89:89:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):155 -> a
-    89:89:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    90:95:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):155:160 -> a
-    90:95:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
-    96:102:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):168:174 -> a
-    103:104:void run(java.lang.String[]):178:179 -> a
-    103:104:void lambda$main$1(java.lang.String[]):200 -> a
-    105:105:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
-    105:105:void run(java.lang.String[]):180 -> a
-    105:105:void lambda$main$1(java.lang.String[]):200 -> a
-    106:106:void run(java.lang.String[]):181:181 -> a
-    106:106:void lambda$main$1(java.lang.String[]):200 -> a
-    107:107:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
-    107:107:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
-    107:107:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
-    107:107:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
-    107:107:void run(java.lang.String[]):180 -> a
-    107:107:void lambda$main$1(java.lang.String[]):200 -> a
-    108:109:void run(java.lang.String[]):184:185 -> a
-    108:109:void lambda$main$1(java.lang.String[]):200 -> a
-    110:110:void lambda$main$1(java.lang.String[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":115,"2":116,"3":117}}
-    115:115:void run(java.lang.String[]):185:185 -> a
-    115:115:void lambda$main$1(java.lang.String[]):200 -> a
-    116:116:void run(java.lang.String[]):185:185 -> a
-    116:116:void lambda$main$1(java.lang.String[]):200 -> a
-    117:117:void run(java.lang.String[]):185:185 -> a
-    117:117:void lambda$main$1(java.lang.String[]):200 -> a
-    111:114:void run(java.lang.String[]):185:188 -> a
-    111:114:void lambda$main$1(java.lang.String[]):200 -> a
+    72:80:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):152:160 -> a
+    72:80:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    81:84:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):110:113 -> a
+    85:85:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
+    85:85:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):155 -> a
+    85:85:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    86:91:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):155:160 -> a
+    86:91:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):108 -> a
+    92:98:com.android.tools.r8.graph.AppView readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):168:174 -> a
+    99:100:void run(java.lang.String[]):178:179 -> a
+    99:100:void lambda$main$1(java.lang.String[]):200 -> a
+    101:101:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> a
+    101:101:void run(java.lang.String[]):180 -> a
+    101:101:void lambda$main$1(java.lang.String[]):200 -> a
+    102:102:void run(java.lang.String[]):181:181 -> a
+    102:102:void lambda$main$1(java.lang.String[]):200 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> a
+    103:103:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> a
+    103:103:void run(java.lang.String[]):180 -> a
+    103:103:void lambda$main$1(java.lang.String[]):200 -> a
+    104:105:void run(java.lang.String[]):184:185 -> a
+    104:105:void lambda$main$1(java.lang.String[]):200 -> a
+    106:106:void lambda$main$1(java.lang.String[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":111,"2":112,"3":113}}
+    111:111:void run(java.lang.String[]):185:185 -> a
+    111:111:void lambda$main$1(java.lang.String[]):200 -> a
+    112:112:void run(java.lang.String[]):185:185 -> a
+    112:112:void lambda$main$1(java.lang.String[]):200 -> a
+    113:113:void run(java.lang.String[]):185:185 -> a
+    113:113:void lambda$main$1(java.lang.String[]):200 -> a
+    107:110:void run(java.lang.String[]):185:188 -> a
+    107:110:void lambda$main$1(java.lang.String[]):200 -> a
     1:4:void main(java.lang.String[]):197:200 -> main
     5:5:void main(java.lang.String[]):198:198 -> main
     1:5:void run(com.android.tools.r8.L8Command):50:54 -> run
@@ -2371,18 +2370,21 @@
     2:2:void <init>(boolean,boolean,com.android.tools.r8.L8Command$1):39:39 -> <init>
     3:23:void <init>(com.android.tools.r8.R8Command,com.android.tools.r8.D8Command,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.CompilationMode,com.android.tools.r8.ProgramConsumer,com.android.tools.r8.StringConsumer,int,com.android.tools.r8.utils.Reporter,boolean,java.util.function.BiPredicate,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.util.List,java.util.List,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.graph.DexItemFactory):105:125 -> <init>
     24:28:void <init>(boolean,boolean):129:133 -> <init>
-    1:44:com.android.tools.r8.utils.InternalOptions getInternalOptions():162:205 -> b
-    45:45:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):97:97 -> b
-    45:45:com.android.tools.r8.utils.InternalOptions getInternalOptions():205 -> b
-    46:57:com.android.tools.r8.utils.InternalOptions getInternalOptions():205:216 -> b
-    58:58:com.android.tools.r8.DumpOptions dumpOptions():445:445 -> b
-    58:58:com.android.tools.r8.utils.InternalOptions getInternalOptions():217 -> b
-    59:63:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):128:132 -> b
-    59:63:com.android.tools.r8.DumpOptions dumpOptions():446 -> b
-    59:63:com.android.tools.r8.utils.InternalOptions getInternalOptions():217 -> b
-    64:67:com.android.tools.r8.DumpOptions dumpOptions():447:450 -> b
-    64:67:com.android.tools.r8.utils.InternalOptions getInternalOptions():217 -> b
-    68:68:com.android.tools.r8.utils.InternalOptions getInternalOptions():217:217 -> b
+    1:36:com.android.tools.r8.utils.InternalOptions getInternalOptions():162:197 -> b
+    37:43:void com.android.tools.r8.utils.InternalOptions.setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp):894:900 -> b
+    37:43:com.android.tools.r8.utils.InternalOptions getInternalOptions():197 -> b
+    44:51:com.android.tools.r8.utils.InternalOptions getInternalOptions():198:205 -> b
+    52:52:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):97:97 -> b
+    52:52:com.android.tools.r8.utils.InternalOptions getInternalOptions():205 -> b
+    53:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():205:216 -> b
+    65:65:com.android.tools.r8.DumpOptions dumpOptions():445:445 -> b
+    65:65:com.android.tools.r8.utils.InternalOptions getInternalOptions():217 -> b
+    66:70:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):128:132 -> b
+    66:70:com.android.tools.r8.DumpOptions dumpOptions():446 -> b
+    66:70:com.android.tools.r8.utils.InternalOptions getInternalOptions():217 -> b
+    71:74:com.android.tools.r8.DumpOptions dumpOptions():447:450 -> b
+    71:74:com.android.tools.r8.utils.InternalOptions getInternalOptions():217 -> b
+    75:75:com.android.tools.r8.utils.InternalOptions getInternalOptions():217:217 -> b
     1:1:com.android.tools.r8.L8Command$Builder builder():153:153 -> builder
     2:2:com.android.tools.r8.L8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):157:157 -> builder
     1:1:com.android.tools.r8.D8Command getD8Command():53:53 -> f
@@ -2543,10 +2545,10 @@
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexApplication lambda$run$8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication) -> a
     1:8: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.utils.AndroidApp):221:228 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     9: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.utils.AndroidApp):229 -> 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.utils.AndroidApp):230:230 -> a
-    11:11:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():497:497 -> a
+    11:11:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():496:496 -> 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.utils.AndroidApp):231 -> a
     12:24: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.utils.AndroidApp):231:243 -> a
     25:26:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):249:250 -> a
@@ -2559,22 +2561,22 @@
     40:40:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):281 -> a
     41:47:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):281:287 -> a
     48:48:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2082,"2":2083,"3":2084}}
-    2082:2082:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
-    2083:2083:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
-    2084:2084:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2074,"2":2075,"3":2076}}
+    2074:2074:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+    2075:2075:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
+    2076:2076:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:287 -> a
     335:336:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):287:288 -> a
     337:337:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2085,"2":2086,"3":2087}}
-    2085:2085:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
-    2086:2086:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
-    2087:2087:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2077,"2":2078,"3":2079}}
+    2077:2077:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+    2078:2078:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
+    2079:2079:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:288 -> a
     625:626:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):288:289 -> a
     627:627:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2088,"2":2089,"3":2090}}
-    2088:2088:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
-    2089:2089:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
-    2090:2090:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2080,"2":2081,"3":2082}}
+    2080:2080:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
+    2081:2081:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
+    2082:2082:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:289 -> a
     916:939:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):289:312 -> a
     940:947:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):35:42 -> a
     940:947:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):312 -> a
@@ -2590,137 +2592,133 @@
     951:951:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):312 -> a
     952:952:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):37:37 -> a
     952:952:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):312 -> a
-    953:956:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):30:33 -> a
-    953:956:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):314 -> a
-    957:957:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):29:29 -> a
-    957:957:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):314 -> a
-    958:967:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):315:324 -> a
-    968:981:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):323:336 -> a
-    982:982:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):335:335 -> a
-    983:998:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):332:347 -> a
-    999:1003:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):346:350 -> a
-    1004:1004:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):349:349 -> a
-    1005:1016:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):348:359 -> a
-    1017:1017:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):358:358 -> a
-    1018:1023:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):355:360 -> a
-    1024:1066:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):354:396 -> a
-    1067:1097:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):395:425 -> a
-    1098:1148:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):420:470 -> a
-    1149:1270:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):467:588 -> a
-    1271:1296:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):585:610 -> a
-    1297:1318:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):608:629 -> a
-    1319:1337:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):624:642 -> a
-    1338:1387:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):641:690 -> a
-    1388:1458:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):671:741 -> a
-    1459:1486:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):740:767 -> a
-    1487:1584:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):764:861 -> a
-    1585:1599:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):797:811 -> a
-    1600:1612:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):808:820 -> a
-    1613:1618: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):25:30 -> a
-    1613:1618:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):820 -> a
-    1619:1644:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):822:847 -> a
-    1645:1663:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):843:861 -> a
-    1664:1664:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):546:546 -> a
-    1665:2081:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):445:861 -> a
-    2091:2091:java.lang.Boolean lambda$run$2():281:281 -> a
-    2092:2092:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):404:404 -> a
-    2093:2093:void lambda$run$9(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):601:601 -> a
-    2094:2094:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$10(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):609:609 -> a
-    2095:2095:void lambda$run$13(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):685:685 -> a
-    2096:2096:void lambda$run$14(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):692:692 -> a
-    2097:2097:void lambda$run$15(java.lang.String):792:792 -> a
-    2098:2098:boolean lambda$run$16(com.android.tools.r8.graph.DexProgramClass):798:798 -> a
-    2099:2105:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):868:874 -> a
-    2106:2109:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):876:879 -> a
-    2110:2110:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):878:878 -> a
-    2111:2125:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):906:920 -> a
-    2126:2133:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):919:926 -> a
-    2134:2134:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):925:925 -> a
-    2135:2137:java.lang.Iterable lambda$performFinalMainDexTracing$20(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):928:930 -> a
-    2138:2140:void lambda$performFinalMainDexTracing$19(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):932:934 -> a
-    2141:2142:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):950:951 -> a
-    2143:2143:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$22(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):953:953 -> a
-    2144:2144:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):956:956 -> a
-    2145:2145:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    2145:2145:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):956 -> a
+    953:963:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):314:324 -> a
+    964:977:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):323:336 -> a
+    978:978:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):335:335 -> a
+    979:994:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):332:347 -> a
+    995:999:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):346:350 -> a
+    1000:1000:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):349:349 -> a
+    1001:1012:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):348:359 -> a
+    1013:1013:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):358:358 -> a
+    1014:1019:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):355:360 -> a
+    1020:1062:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):354:396 -> a
+    1063:1093:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):395:425 -> a
+    1094:1144:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):420:470 -> a
+    1145:1264:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):467:586 -> a
+    1265:1290:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):583:608 -> a
+    1291:1312:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):606:627 -> a
+    1313:1331:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):622:640 -> a
+    1332:1381:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):639:688 -> a
+    1382:1452:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):669:739 -> a
+    1453:1480:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):738:765 -> a
+    1481:1578:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):762:859 -> a
+    1579:1593:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):795:809 -> a
+    1594:1606:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):806:818 -> a
+    1607:1612: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):25:30 -> a
+    1607:1612:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):818 -> a
+    1613:1638:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):820:845 -> a
+    1639:1657:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):841:859 -> a
+    1658:1658:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):544:544 -> a
+    1659:2073:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):445:859 -> a
+    2083:2083:java.lang.Boolean lambda$run$2():281:281 -> a
+    2084:2084:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):404:404 -> a
+    2085:2085:void lambda$run$9(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):599:599 -> a
+    2086:2086:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$10(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):607:607 -> a
+    2087:2087:void lambda$run$13(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):683:683 -> a
+    2088:2088:void lambda$run$14(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):690:690 -> a
+    2089:2089:void lambda$run$15(java.lang.String):790:790 -> a
+    2090:2090:boolean lambda$run$16(com.android.tools.r8.graph.DexProgramClass):796:796 -> a
+    2091:2097:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):866:872 -> a
+    2098:2101:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):874:877 -> a
+    2102:2102:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):876:876 -> a
+    2103:2117:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):904:918 -> a
+    2118:2125:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):917:924 -> a
+    2126:2126:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):923:923 -> a
+    2127:2129:java.lang.Iterable lambda$performFinalMainDexTracing$20(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):926:928 -> a
+    2130:2132:void lambda$performFinalMainDexTracing$19(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):930:932 -> a
+    2133:2134:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):948:949 -> a
+    2135:2135:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$22(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):951:951 -> a
+    2136:2136:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):954:954 -> a
+    2137:2137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    2137:2137:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):954 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2146:2153:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):957:964 -> a
-    2154:2155:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):976:977 -> a
-    2154:2155:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
-    2156:2156:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    2156:2156:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):977 -> a
-    2156:2156:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
-    2157:2158:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):980:981 -> a
-    2157:2158:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
-    2159:2160:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):965:966 -> a
-    2161:2165:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):987:991 -> a
-    2161:2165:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
-    2166:2166:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
-    2166:2166:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):991 -> a
-    2166:2166:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
-    2167:2167:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):991:991 -> a
-    2167:2167:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
-    2168:2168:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):968:968 -> a
-    2169:2169:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    2169:2169:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):968 -> a
-    2170:2170:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
-    2170:2170:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):968 -> a
-    2171:2171:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):968:968 -> a
-    2172:2185:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1004:1017 -> a
-    2186:2188:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):87:89 -> a
-    2186:2188:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1018 -> a
-    2189:2199:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1022:1032 -> a
-    2200:2200:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1030:1030 -> a
-    2201:2203:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1051:1053 -> a
-    2204:2239:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1052:1087 -> a
-    2240:2244:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1084:1088 -> a
-    2245:2248:boolean verifyNoJarApplicationReaders(java.util.Collection):1092:1095 -> a
-    2249:2249:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1117:1117 -> a
-    2250:2250:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):263:263 -> a
-    2250:2250:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1117 -> a
-    2251:2251:void lambda$main$26(java.lang.String[]):1132:1132 -> a
+    2138:2145:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):955:962 -> a
+    2146:2147:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):974:975 -> a
+    2146:2147:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
+    2148:2148:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2148:2148:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):975 -> a
+    2148:2148:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
+    2149:2150:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):978:979 -> a
+    2149:2150:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):962 -> a
+    2151:2152:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):963:964 -> a
+    2153:2157:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):985:989 -> a
+    2153:2157:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    2158:2158:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
+    2158:2158:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):989 -> a
+    2158:2158:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    2159:2159:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):989:989 -> a
+    2159:2159:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964 -> a
+    2160:2160:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966:966 -> a
+    2161:2161:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    2161:2161:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
+    2162:2162:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
+    2162:2162:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966 -> a
+    2163:2163:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):966:966 -> a
+    2164:2177:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1002:1015 -> a
+    2178:2180:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):87:89 -> a
+    2178:2180:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1016 -> a
+    2181:2191:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1020:1030 -> a
+    2192:2192:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1028:1028 -> a
+    2193:2195:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1049:1051 -> a
+    2196:2231:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1050:1085 -> a
+    2232:2236:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1082:1086 -> a
+    2237:2240:boolean verifyNoJarApplicationReaders(java.util.Collection):1090:1093 -> a
+    2241:2241:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1115:1115 -> a
+    2242:2242:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):263:263 -> a
+    2242:2242:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1115 -> a
+    2243:2243:void lambda$main$26(java.lang.String[]):1130:1130 -> a
     1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):263:263 -> b
     1:1:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):254 -> b
     2:2:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):256:256 -> b
     3:3:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):267:267 -> b
-    4:13:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):889:898 -> b
-    14:17:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):897:900 -> b
-    18:18:void lambda$runEnqueuer$24(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1034:1034 -> b
-    19:20:void run(java.lang.String[]):1103:1104 -> b
+    4:13:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):887:896 -> b
+    14:17:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):895:898 -> b
+    18:18:void lambda$runEnqueuer$24(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1032:1032 -> b
+    19:20:void run(java.lang.String[]):1101:1102 -> b
     21:21:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    21:21:void run(java.lang.String[]):1105 -> b
-    22:22:void run(java.lang.String[]):1106:1106 -> b
+    21:21:void run(java.lang.String[]):1103 -> b
+    22:22:void run(java.lang.String[]):1104:1104 -> b
     23:23:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
     23:23:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
     23:23:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
     23:23:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    23:23:void run(java.lang.String[]):1105 -> b
-    24:25:void run(java.lang.String[]):1109:1110 -> b
+    23:23:void run(java.lang.String[]):1103 -> b
+    24:25:void run(java.lang.String[]):1107:1108 -> b
     26:26:void run(java.lang.String[]):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1145,"2":1146,"3":1147}}
-    1145:1145:void run(java.lang.String[]):1110:1110 -> b
-    1146:1146:void run(java.lang.String[]):1110:1110 -> b
-    1147:1147:void run(java.lang.String[]):1110:1110 -> b
-    1136:1142:void run(java.lang.String[]):1110:1116 -> b
-    1143:1143:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
-    1143:1143:void run(java.lang.String[]):1116 -> b
-    1144:1144:void run(java.lang.String[]):1119:1119 -> b
-    1:1:java.lang.Iterable lambda$run$11(com.android.tools.r8.graph.AppView):643:643 -> c
-    1:1:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):662:662 -> d
-    2:5:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):661:664 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1143,"2":1144,"3":1145}}
+    1143:1143:void run(java.lang.String[]):1108:1108 -> b
+    1144:1144:void run(java.lang.String[]):1108:1108 -> b
+    1145:1145:void run(java.lang.String[]):1108:1108 -> b
+    1134:1140:void run(java.lang.String[]):1108:1114 -> b
+    1141:1141:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
+    1141:1141:void run(java.lang.String[]):1114 -> b
+    1142:1142:void run(java.lang.String[]):1117:1117 -> b
+    1:1:java.lang.Iterable lambda$run$11(com.android.tools.r8.graph.AppView):641:641 -> c
+    1:1:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):660:660 -> d
+    2:5:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):659:662 -> d
     6:6:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():59:59 -> d
-    6:6:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):664 -> d
-    7:7:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):661:661 -> d
-    1:3:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):833:835 -> e
-    4:7:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):834:837 -> e
+    6:6:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):662 -> d
+    7:7:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):659:659 -> d
+    1:3:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):831:833 -> e
+    4:7:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):832:835 -> e
     8:8:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():59:59 -> e
-    8:8:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):837 -> e
-    9:9:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):833:833 -> e
+    8:8:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):835 -> e
+    9:9:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):831:831 -> e
     1:1:java.lang.Boolean lambda$run$5(com.android.tools.r8.graph.AppView):442:442 -> f
     1:1:java.lang.Boolean lambda$run$6(com.android.tools.r8.graph.AppView):452:452 -> g
-    1:1:java.lang.Boolean lambda$run$7(com.android.tools.r8.graph.AppView):527:527 -> h
-    1:4:void main(java.lang.String[]):1129:1132 -> main
-    5:5:void main(java.lang.String[]):1130:1130 -> main
+    1:1:java.lang.Boolean lambda$run$7(com.android.tools.r8.graph.AppView):525:525 -> h
+    1:4:void main(java.lang.String[]):1127:1130 -> main
+    5:5:void main(java.lang.String[]):1128:1128 -> main
     1:3:void run(com.android.tools.r8.R8Command):187:189 -> run
     4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):203:206 -> run
     8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> run
@@ -2771,18 +2769,21 @@
     117:117:com.android.tools.r8.utils.InternalOptions getInternalOptions():921 -> b
     118:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():923:925 -> b
     121:127:com.android.tools.r8.utils.InternalOptions getInternalOptions():922:928 -> b
-    128:128:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    128:128:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     128:128:com.android.tools.r8.utils.InternalOptions getInternalOptions():933 -> b
-    129:150:com.android.tools.r8.utils.InternalOptions getInternalOptions():934:955 -> b
-    151:159:com.android.tools.r8.utils.InternalOptions getInternalOptions():954:962 -> b
-    160:160:com.android.tools.r8.DumpOptions dumpOptions():994:994 -> b
-    160:160:com.android.tools.r8.utils.InternalOptions getInternalOptions():963 -> b
-    161:165:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):128:132 -> b
-    161:165:com.android.tools.r8.DumpOptions dumpOptions():995 -> b
-    161:165:com.android.tools.r8.utils.InternalOptions getInternalOptions():963 -> b
-    166:175:com.android.tools.r8.DumpOptions dumpOptions():996:1005 -> b
-    166:175:com.android.tools.r8.utils.InternalOptions getInternalOptions():963 -> b
-    176:176:com.android.tools.r8.utils.InternalOptions getInternalOptions():963:963 -> b
+    129:141:com.android.tools.r8.utils.InternalOptions getInternalOptions():934:946 -> b
+    142:148:void com.android.tools.r8.utils.InternalOptions.setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp):894:900 -> b
+    142:148:com.android.tools.r8.utils.InternalOptions getInternalOptions():946 -> b
+    149:156:com.android.tools.r8.utils.InternalOptions getInternalOptions():948:955 -> b
+    157:165:com.android.tools.r8.utils.InternalOptions getInternalOptions():954:962 -> b
+    166:166:com.android.tools.r8.DumpOptions dumpOptions():994:994 -> b
+    166:166:com.android.tools.r8.utils.InternalOptions getInternalOptions():963 -> b
+    167:171:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.DumpOptions$Builder):128:132 -> b
+    167:171:com.android.tools.r8.DumpOptions dumpOptions():995 -> b
+    167:171:com.android.tools.r8.utils.InternalOptions getInternalOptions():963 -> b
+    172:181:com.android.tools.r8.DumpOptions dumpOptions():996:1005 -> b
+    172:181:com.android.tools.r8.utils.InternalOptions getInternalOptions():963 -> b
+    182:182:com.android.tools.r8.utils.InternalOptions getInternalOptions():963:963 -> b
     1:1:com.android.tools.r8.R8Command$Builder builder():676:676 -> builder
     2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):681:681 -> builder
     1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():821:821 -> getDexItemFactory
@@ -3210,13 +3211,13 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):192:194 -> <init>
     1:5:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):199:203 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):209:213 -> finished
-com.android.tools.r8.StringResource -> com.android.tools.r8.internal.MW:
+com.android.tools.r8.StringResource -> com.android.tools.r8.internal.CW:
     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$FileResource -> com.android.tools.r8.internal.KW:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.AW:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -3226,7 +3227,7 @@
     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.LW:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.BW:
     com.android.tools.r8.origin.Origin origin -> a
     java.lang.String content -> b
     boolean $assertionsDisabled -> c
@@ -3252,7 +3253,7 @@
     25:25:java.lang.String getVersionString():21:21 -> getVersionString
     22:22: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.PT:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.FT:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -3433,10 +3434,10 @@
     2:2:void access$100(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexType):37:37 -> a
     3:3:void access$200(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexMethod):37:37 -> a
     4:4:void run(java.util.concurrent.ExecutorService):121:121 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     5:5:void run(java.util.concurrent.ExecutorService):121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     6:6:void run(java.util.concurrent.ExecutorService):121 -> a
     7:23:void run(java.util.concurrent.ExecutorService):121:137 -> a
     24:24:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
@@ -3486,10 +3487,10 @@
     296:303:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):246:253 -> a
     304:304:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):252:252 -> a
     305:312:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):251:258 -> a
-    313:313:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
+    313:313:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> a
     313:313:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    314:314:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
+    314:314:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> a
     314:314:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     315:315:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):257:257 -> a
     316:316:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
@@ -3524,7 +3525,7 @@
     2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):97:97 -> f
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):52:52 -> g
     2:2:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):92:92 -> g
-com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.Z3:
+com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.Y3:
     java.util.Set exceptions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():24:24 -> <clinit>
@@ -4395,7 +4396,7 @@
     3672:3672:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
     3673:3673:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
     2989:2989:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):401:401 -> a
-com.android.tools.r8.androidapi.ComputedApiLevel -> com.android.tools.r8.internal.Dc:
+com.android.tools.r8.androidapi.ComputedApiLevel -> com.android.tools.r8.internal.Cc:
     int $r8$clinit -> a
     1:1:void <clinit>():15:15 -> <clinit>
     com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel asKnownApiLevel() -> F
@@ -4409,10 +4410,10 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel notSet():18:18 -> q
     boolean isKnownApiLevel() -> r
     boolean isNotSetApiLevel() -> y
-com.android.tools.r8.androidapi.ComputedApiLevel$1 -> com.android.tools.r8.internal.Cc:
+com.android.tools.r8.androidapi.ComputedApiLevel$1 -> com.android.tools.r8.internal.Bc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():42:42 -> <clinit>
-com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel -> com.android.tools.r8.internal.Dc$a:
+com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel -> com.android.tools.r8.internal.Cc$a:
     com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel PLATFORM_INSTANCE -> c
     com.android.tools.r8.utils.AndroidApiLevel apiLevel -> b
     1:1:void <clinit>():124:124 -> <clinit>
@@ -4424,14 +4425,14 @@
     1:1:int hashCode():166:166 -> hashCode
     boolean isKnownApiLevel() -> r
     1:1:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel -> com.android.tools.r8.internal.Ec:
+com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel -> com.android.tools.r8.internal.Dc:
     com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel INSTANCE -> b
     1:1:void <clinit>():75:75 -> <clinit>
     1:1:void <init>():77:77 -> <init>
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel access$000():73:73 -> a
     1:1:int hashCode():91:91 -> hashCode
     boolean isNotSetApiLevel() -> y
-com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel -> com.android.tools.r8.internal.Ec:
     com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel INSTANCE -> b
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>():99:99 -> <init>
@@ -4439,20 +4440,20 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel access$100():95:95 -> a
     1:1:int hashCode():118:118 -> hashCode
     1:1:java.lang.String toString():108:108 -> toString
-com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.a5:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.Z4:
     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:22:void com.android.tools.r8.bisect.Bisect.writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):186:203 -> a
     5:22: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
     23:29: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.a5$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.Z4$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.b5:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.a5:
     com.android.tools.r8.bisect.BisectOptions$Result UNKNOWN -> b
     com.android.tools.r8.bisect.BisectOptions$Result GOOD -> c
     com.android.tools.r8.bisect.BisectOptions$Result BAD -> d
     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.f5:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.e5:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -4607,7 +4608,7 @@
     25:25:void com.android.tools.r8.bisect.BisectState.$closeResource(java.lang.Throwable,java.lang.AutoCloseable):189:189 -> d
     25:25:void write():321 -> d
     26:26:void write():321:321 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.d5:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.c5:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -4626,24 +4627,24 @@
     1:5:boolean equals(java.lang.Object):99:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":190,"2":191,"3":192}}
-    190:190:java.lang.String toString():94:94 -> toString
-    191:191:java.lang.String toString():94:94 -> toString
-    192:192:java.lang.String toString():94:94 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":97,"2":98,"3":99}}
+    97:97:java.lang.String toString():94:94 -> toString
+    98:98:java.lang.String toString():94:94 -> toString
+    99:99:java.lang.String toString():94:94 -> toString
     95:95:java.lang.String toString():94:94 -> toString
     96:96:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":193,"2":194,"3":195}}
-    193:193:java.lang.String toString():94:94 -> toString
-    194:194:java.lang.String toString():94:94 -> toString
-    195:195:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.e5:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":97,"2":98,"3":99}}
+    97:97:java.lang.String toString():94:94 -> toString
+    98:98:java.lang.String toString():94:94 -> toString
+    99:99:java.lang.String toString():94:94 -> toString
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.d5:
     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.S6:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.R6:
     java.util.Map knownTypeFields -> r
     java.util.Set imports -> j
     boolean pendingComma -> p
@@ -5081,7 +5082,7 @@
     1:2:java.util.List getImports():104:105 -> i
     1:1:java.util.List getMethods():110:110 -> j
     1:1:java.util.Set getSynthesizedTypes():644:644 -> k
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.l8:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.k8:
     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
@@ -5333,7 +5334,7 @@
     1:1:void print(com.android.tools.r8.cf.code.CfReturnVoid):356:356 -> f
     1:1:void print(com.android.tools.r8.cf.code.CfArrayLength):557:557 -> g
     1:1:java.lang.String toString():816:816 -> toString
-com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.k8:
+com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.j8:
     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
@@ -5342,7 +5343,7 @@
     2:2:void <clinit>():673:673 -> <clinit>
     3:3:void <clinit>():319:319 -> <clinit>
     4:4:void <clinit>():275:275 -> <clinit>
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.o8:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.n8:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -5481,7 +5482,7 @@
     47:47:void com.android.tools.r8.cf.CfRegisterAllocator.updateFirstStackByJoiningTheSecond(java.util.List,java.util.List):605:605 -> b
     47:47:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):394 -> b
     1:1:com.android.tools.r8.utils.InternalOptions options():146:146 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.n8:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.m8:
     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>
@@ -5491,7 +5492,7 @@
     91:91:java.lang.String toString():78:78 -> toString
     92:92:java.lang.String toString():79:79 -> toString
     81:89:java.lang.String toString():80:88 -> toString
-com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.V8:
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.U8:
     com.android.tools.r8.cf.CfVersion V17 -> n
     com.android.tools.r8.cf.CfVersion V12 -> l
     com.android.tools.r8.cf.CfVersion V15 -> m
@@ -5539,28 +5540,28 @@
     262:262:java.lang.String toString():128:128 -> toString
     130:130:java.lang.String toString():128:128 -> toString
     131:131:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":263,"2":264,"3":265}}
-    263:263:java.lang.String toString():128:128 -> toString
-    264:264:java.lang.String toString():128:128 -> toString
-    265:265:java.lang.String toString():128:128 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":260,"2":261,"3":262}}
+    260:260:java.lang.String toString():128:128 -> toString
+    261:261:java.lang.String toString():128:128 -> toString
+    262:262:java.lang.String toString():128:128 -> toString
     259:259:java.lang.String toString():128:128 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.vk:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.qk:
     com.android.tools.r8.ir.code.Phi phi -> r
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
-    boolean isConstant() -> L
-    boolean needsRegister() -> W
+    boolean isConstant() -> K
+    boolean needsRegister() -> V
     1:1:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26:26 -> a
     2:2:int com.android.tools.r8.cf.CfRegisterAllocator.getRegisterForValue(com.android.tools.r8.ir.code.Value,int):128:128 -> a
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> h0
+    1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> g0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
     47:47:java.lang.String toString():45:45 -> toString
     48:48:java.lang.String toString():45:45 -> toString
     49:49:java.lang.String toString():45:45 -> toString
     46:46:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.rC:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.kC:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -5718,14 +5719,14 @@
     99:101: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
     99:101:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):205 -> b
     102:104: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.pC:
+com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.iC:
     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.qC:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.jC:
     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.s00:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.i00:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -5767,20 +5768,20 @@
     139:144:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):320:325 -> a
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):155:173 -> b
     20:20:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":208,"2":209,"3":210}}
-    208:208:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):173:173 -> b
-    209:209:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):173:173 -> b
-    210:210:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):173:173 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":199,"2":200,"3":201}}
+    199:199:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):173:173 -> b
+    200:200:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):173:173 -> b
+    201:201:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):173:173 -> b
     193:193:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):173:173 -> b
     194:194:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):171:171 -> b
     195:195:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):169:169 -> b
     196:196:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):167:167 -> b
     197:197:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):165:165 -> b
     198:198: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.n00:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.d00:
     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.o00:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.e00:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -5788,7 +5789,7 @@
     2:4:void <init>(com.android.tools.r8.graph.DexType):44:46 -> <init>
     1:1:com.android.tools.r8.graph.DexType getDexType():51:51 -> a
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.p00:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.f00:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -5802,7 +5803,7 @@
     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.q00:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.g00:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -5817,9 +5818,9 @@
     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.r00:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.h00:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.D6:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.C6:
     com.android.tools.r8.ir.code.NumericType type -> c
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode opcode -> b
     int $r8$clinit -> e
@@ -5828,10 +5829,10 @@
     1:5:void <init>(com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode,com.android.tools.r8.ir.code.NumericType):43:47 -> <init>
     1:13:int getAsmOpcode():117:129 -> F
     14:14:int getAsmOpcode():0:0 -> F
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":158,"2":159,"3":160}}
-    158:158:int getAsmOpcode():129:129 -> F
-    159:159:int getAsmOpcode():129:129 -> F
-    160:160:int getAsmOpcode():129:129 -> F
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":149,"2":150,"3":151}}
+    149:149:int getAsmOpcode():129:129 -> F
+    150:150:int getAsmOpcode():129:129 -> F
+    151:151:int getAsmOpcode():129:129 -> F
     143:143:int getAsmOpcode():129:129 -> F
     144:144:int getAsmOpcode():127:127 -> F
     145:145:int getAsmOpcode():125:125 -> F
@@ -5858,18 +5859,18 @@
     221:221:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):183:183 -> a
     222:222:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):180:180 -> a
     223:223:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):177:177 -> a
-    241:241:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):210:210 -> a
-    242:242:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):157:157 -> a
-    242:242:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):210 -> a
-    243:243:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):211:211 -> a
+    241:241: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):211:211 -> a
+    242:242:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):156:156 -> a
+    242:242: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):211 -> a
+    243:243: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 -> q
     1:1:int getCompareToId():52:52 -> s
-com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.C6:
+com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.B6:
     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.D6$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.C6$a:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Rem -> f
@@ -5880,7 +5881,7 @@
     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.E6:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.D6:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -5891,11 +5892,11 @@
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):67:67 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayLength():82:82 -> a
     9:9: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):74 -> a
-    10:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):85:86 -> a
-    12:12:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):87 -> 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):86:86 -> a
+    11:11:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    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):86 -> a
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.F6:
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.E6:
     com.android.tools.r8.ir.code.MemberType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -5927,10 +5928,10 @@
     33:41:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):59:67 -> a
     33:41: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
     42:48:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):108:114 -> a
-    49:50:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):131:132 -> a
+    49:50: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() -> q
     1:1:int getCompareToId():42:42 -> s
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.G6:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.F6:
     com.android.tools.r8.ir.code.MemberType type -> b
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):34:35 -> <init>
     1:19:int getStoreType():54:72 -> F
@@ -5947,38 +5948,38 @@
     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):86:86 -> a
     4:4:void print(com.android.tools.r8.cf.CfPrinter):91:91 -> a
     5:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):101:104 -> a
-    9:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):121:123 -> a
+    9: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):122:124 -> a
     boolean canThrow() -> q
     1:1:int getCompareToId():44:44 -> s
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.J6:
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.I6:
     com.android.tools.r8.graph.DexType type -> b
     boolean ignoreCompatRules -> c
-    1:1:void <init>(com.android.tools.r8.graph.DexType):37:37 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexType,boolean):40:42 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexType):36:36 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexType,boolean):39:41 -> <init>
     boolean isTypeInstruction() -> E
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):77:77 -> 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):76:76 -> a
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> 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):77 -> a
-    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):90:90 -> 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):76 -> a
+    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):89:89 -> a
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    4:4: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 -> a
-    5:5: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):91:91 -> a
-    6:6:void print(com.android.tools.r8.cf.CfPrinter):96:96 -> a
-    7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):102:102 -> a
-    8:8:boolean com.android.tools.r8.cf.code.CfCheckCast.ignoreCompatRules():46:46 -> a
-    8:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):102 -> a
-    9:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):102:102 -> a
-    10:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):113:115 -> a
-    13:13:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):119:119 -> a
-    14:14: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):125:125 -> a
-    15:15:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):136:136 -> a
-    16:16:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    16:16:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):136 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():61:61 -> getType
+    4:4: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):89 -> a
+    5:5: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
+    6:6:void print(com.android.tools.r8.cf.CfPrinter):95:95 -> a
+    7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):101:101 -> a
+    8:8:boolean com.android.tools.r8.cf.code.CfCheckCast.ignoreCompatRules():45:45 -> a
+    8:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):101 -> a
+    9:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):101:101 -> a
+    10:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112:114 -> a
+    13:13:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):118:118 -> a
+    14:14: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):124:124 -> a
+    15:15: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):136:136 -> a
+    16:16:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    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):136 -> a
+    1:1:com.android.tools.r8.graph.DexType getType():60:60 -> getType
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.Q6:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.P6:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> b
     com.android.tools.r8.ir.code.NumericType type -> c
     boolean $assertionsDisabled -> d
@@ -5986,10 +5987,10 @@
     1:8:void <init>(com.android.tools.r8.ir.code.Cmp$Bias,com.android.tools.r8.ir.code.NumericType):37:44 -> <init>
     1:9:int getAsmOpcode():84:92 -> F
     10:10:int getAsmOpcode():0:0 -> F
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":107,"2":108,"3":109}}
-    107:107:int getAsmOpcode():92:92 -> F
-    108:108:int getAsmOpcode():92:92 -> F
-    109:109:int getAsmOpcode():92:92 -> F
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":104,"2":105,"3":106}}
+    104:104:int getAsmOpcode():92:92 -> F
+    105:105:int getAsmOpcode():92:92 -> F
+    106:106:int getAsmOpcode():92:92 -> F
     102:102:int getAsmOpcode():92:92 -> F
     103:103:int getAsmOpcode():88:88 -> F
     1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():59:59 -> G
@@ -6000,78 +6001,78 @@
     3:3:void print(com.android.tools.r8.cf.CfPrinter):98:98 -> a
     4:4: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):111:111 -> a
     5:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):116:118 -> a
-    8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
-    9:9:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):157:157 -> a
-    9:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):135 -> a
-    10:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):136:136 -> a
-    11:11:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    11:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):136 -> 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):136:136 -> a
+    9:9:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):156:156 -> 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):136 -> 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):137:137 -> a
+    11:11:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    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):137 -> a
     1:1:int getCompareToId():49:49 -> s
-com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.P6:
+com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.O6:
     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.V6:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.U6:
     com.android.tools.r8.graph.DexType type -> b
     boolean ignoreCompatRules -> c
-    1:3:void <init>(com.android.tools.r8.graph.DexType,boolean):40:42 -> <init>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,boolean):39:41 -> <init>
     boolean isTypeInstruction() -> E
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):57:57 -> 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):56:56 -> a
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> 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):57 -> a
-    3:3:void print(com.android.tools.r8.cf.CfPrinter):95:95 -> a
-    4:4:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    4:4: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 -> 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):56 -> a
+    3:3:void print(com.android.tools.r8.cf.CfPrinter):94:94 -> a
+    4:4:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):103:103 -> a
+    4:4: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):89 -> a
     5:5: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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":60,"2":61,"3":62}}
-    60:60:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    60:60: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 -> a
+    60:60:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):103:103 -> a
+    60:60: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):89 -> a
     61:61:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    61:61:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104 -> a
-    61:61: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 -> a
+    61:61:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):103 -> a
+    61:61: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):89 -> a
     62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    62:62:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104 -> a
-    62:62: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 -> a
-    6:27:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):105:126 -> a
-    6:27: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 -> a
+    62:62:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):103 -> a
+    62:62: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):89 -> a
+    6:27:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:125 -> a
+    6:27: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):89 -> a
     28:28: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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":63,"2":64,"3":65,"4":66,"5":67}}
-    63:63:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):126:126 -> a
-    63:63: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 -> a
-    64:64:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):126:126 -> a
-    64:64: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 -> a
-    65:65:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):126:126 -> a
-    65:65: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 -> a
-    66:66:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):126:126 -> a
-    66:66: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 -> a
-    67:67:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):126:126 -> a
-    67:67: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 -> a
-    29:29:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):126:126 -> a
-    29:29: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 -> a
-    30:34:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):110:114 -> a
-    30:34: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 -> a
-    35:49:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):108:122 -> a
-    35:49: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 -> a
-    50:56:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):118:124 -> a
-    50:56: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 -> a
-    57:57:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):116:116 -> a
-    57:57: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 -> a
-    58:58:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):112:112 -> a
-    58:58: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 -> a
-    59:59: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
-    68:68:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):133:133 -> a
-    69:69:boolean com.android.tools.r8.cf.code.CfConstClass.ignoreCompatRules():46:46 -> a
-    69:69:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):133 -> a
-    70:70:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):133:133 -> a
-    71:71:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):138:138 -> a
-    72:72: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):144:144 -> a
-    73:73:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):155:155 -> a
-    74:74:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    74:74:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):155 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():72:72 -> getType
+    63:63:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):125:125 -> a
+    63:63: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):89 -> a
+    64:64:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):125:125 -> a
+    64:64: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):89 -> a
+    65:65:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):125:125 -> a
+    65:65: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):89 -> a
+    66:66:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):125:125 -> a
+    66:66: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):89 -> a
+    67:67:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):125:125 -> a
+    67:67: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):89 -> a
+    29:29:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):125:125 -> a
+    29:29: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):89 -> a
+    30:34:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):109:113 -> a
+    30:34: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):89 -> a
+    35:49:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):107:121 -> a
+    35:49: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):89 -> a
+    50:56:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):117:123 -> a
+    50:56: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):89 -> a
+    57:57:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):115:115 -> a
+    57:57: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):89 -> a
+    58:58:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):111:111 -> a
+    58:58: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):89 -> a
+    59:59: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):89:89 -> a
+    68:68:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):132:132 -> a
+    69:69:boolean com.android.tools.r8.cf.code.CfConstClass.ignoreCompatRules():45:45 -> a
+    69:69:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):132 -> a
+    70:70:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):132:132 -> a
+    71:71:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):137:137 -> a
+    72:72: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):143:143 -> a
+    73:73: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):155:155 -> a
+    74:74:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    74:74: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):155 -> a
+    1:1:com.android.tools.r8.graph.DexType getType():71:71 -> getType
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.W6:
+com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.V6:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():40:40 -> <clinit>
@@ -6120,14 +6121,14 @@
     27:27:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):212 -> a
     28:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):212:212 -> a
     29:29: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):218:218 -> a
-    30:30:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
-    31:31:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    31:31:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):229 -> a
+    30:30: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):230:230 -> a
+    31:31:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    31:31: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):230 -> a
     1:1:com.android.tools.r8.graph.DexType getType():169:169 -> getType
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.X6:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.W6:
     com.android.tools.r8.graph.DexMethodHandle handle -> b
     1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):34:35 -> <init>
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():39:39 -> F
@@ -6142,14 +6143,14 @@
     19:23:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88 -> a
     24:24:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodHandle(int,com.android.tools.r8.graph.DexMethodHandle):1224:1224 -> a
     24:24:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88 -> a
-    25:25:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):106:106 -> a
-    26:26:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    26:26:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):106 -> a
+    25:25: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:107 -> a
+    26:26:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    26:26: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
     27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():343:343 -> a
     27:27: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):95 -> a
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.Y6:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.X6:
     com.android.tools.r8.graph.DexProto type -> b
     1:2:void <init>(com.android.tools.r8.graph.DexProto):34:35 -> <init>
     1:1:com.android.tools.r8.graph.DexProto getType():39:39 -> F
@@ -6168,14 +6169,14 @@
     21:25:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
     26:26:void com.android.tools.r8.ir.conversion.IRBuilder.addConstMethodType(int,com.android.tools.r8.graph.DexProto):1239:1239 -> a
     26:26:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86 -> a
-    27:27:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):104:104 -> a
-    28:28:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    28:28:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):104 -> a
+    27:27: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:105 -> a
+    28:28:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    28:28: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
     29:29:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():347:347 -> a
     29:29: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):93 -> a
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.Z6:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.Y6:
     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
@@ -6183,13 +6184,13 @@
     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):1211:1211 -> 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:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):77:77 -> a
-    7:7:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    7:7:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):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):78:78 -> a
+    7:7:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> 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):78 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> 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):66 -> a
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.b7:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.a7:
     com.android.tools.r8.ir.code.ValueType type -> c
     long value -> b
     int $r8$clinit -> e
@@ -6228,14 +6229,14 @@
     281:281: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):169 -> a
     282:282:void print(com.android.tools.r8.cf.CfPrinter):158:158 -> a
     283:283:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163:163 -> a
-    284:284:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):180:180 -> a
-    285:285:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    285:285:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):180 -> a
+    284:284: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:181 -> a
+    285:285:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    285:285: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() -> s
-com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.a7:
+com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.Z6:
     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.c7:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.b7:
     com.android.tools.r8.graph.DexString string -> b
     1:2:void <init>(com.android.tools.r8.graph.DexString):30:31 -> <init>
     1:1:com.android.tools.r8.graph.DexString getString():46:46 -> F
@@ -6250,13 +6251,13 @@
     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):89 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> a
     11:11: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):96 -> a
-    12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):107:107 -> a
-    13:13:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    13:13:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):107 -> 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):108:108 -> a
+    13:13:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    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):108 -> a
     com.android.tools.r8.cf.code.CfConstString asConstString() -> d
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.d7:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.c7:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     com.android.tools.r8.graph.DexReference item -> b
     boolean $assertionsDisabled -> d
@@ -6276,108 +6277,108 @@
     10:11: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
     12:15:void com.android.tools.r8.ir.conversion.IRBuilder.addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1264:1267 -> a
     12:15: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
-    16:16:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):126:126 -> a
-    17:17:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    17:17:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):126 -> a
+    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):127:127 -> a
+    17:17:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    17:17: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):127 -> a
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> e
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.e7:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.d7:
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
     com.android.tools.r8.graph.DexField declaringField -> d
     com.android.tools.r8.graph.DexField field -> c
     int opcode -> b
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.graph.DexField):44:44 -> <init>
-    2:6:void <init>(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):47:51 -> <init>
-    1:1:int getOpcode():74:74 -> F
-    1:1:boolean isFieldGet():89:89 -> G
-    1:1:int lambda$specify$0(com.android.tools.r8.cf.code.CfFieldInstruction):40:40 -> a
-    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):40:40 -> a
-    3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):85:85 -> a
-    4:4: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):116:116 -> a
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexField):43:43 -> <init>
+    2:6:void <init>(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):46:50 -> <init>
+    1:1:int getOpcode():73:73 -> F
+    1:1:boolean isFieldGet():88:88 -> G
+    1:1:int lambda$specify$0(com.android.tools.r8.cf.code.CfFieldInstruction):39:39 -> a
+    2:2:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):39:39 -> a
+    3:3:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):84:84 -> a
+    4:4: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):115:115 -> a
     5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):468:468 -> a
-    5:5: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):116 -> a
+    5:5: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):115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6: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):117:117 -> a
+    6:6: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):116:116 -> a
     7:7:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):468:468 -> 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):117 -> a
-    8:11: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):118:121 -> a
-    12:12:void print(com.android.tools.r8.cf.CfPrinter):126:126 -> a
-    13:40:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):136:163 -> 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):116 -> a
+    8:11: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):117:120 -> a
+    12:12:void print(com.android.tools.r8.cf.CfPrinter):125:125 -> a
+    13:40:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):135:162 -> a
     41:41:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":235,"2":236,"3":237}}
-    235:235:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163:163 -> a
-    236:236:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163:163 -> 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):163:163 -> a
-    204:204:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):163:163 -> a
-    205:207:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):157:159 -> a
-    208:209:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):151:152 -> a
-    210:211:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):145:146 -> a
-    212:212:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):140:140 -> a
-    238:248: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):170:180 -> a
-    249:249: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":441,"2":442,"3":443}}
-    441:441: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):180:180 -> a
-    442:442: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):180:180 -> a
-    443:443: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):180:180 -> a
-    429:429: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):180:180 -> a
-    430:430: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):178:178 -> a
-    431:431: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):176:176 -> a
-    432:432: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):174:174 -> a
-    433:433: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):172:172 -> a
-    444:472:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):190:218 -> a
-    473:473:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":704,"2":705,"3":706}}
-    704:704:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):218:218 -> a
-    705:705:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):218:218 -> a
-    706:706:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):218:218 -> a
-    691:691:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):218:218 -> a
-    692:696:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):204:208 -> a
-    697:698:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):107:108 -> a
-    697:698:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):206 -> a
-    699:699:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):194:194 -> a
-    700:700:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    700:700:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):194 -> a
-    701:701:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):215:215 -> a
-    702:702:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):199:199 -> a
-    703:703:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    703:703:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):199 -> a
-    1:1:com.android.tools.r8.graph.DexField lambda$specify$1(com.android.tools.r8.cf.code.CfFieldInstruction):40:40 -> b
-    1:1:com.android.tools.r8.graph.DexField lambda$specify$2(com.android.tools.r8.cf.code.CfFieldInstruction):40:40 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":234,"2":235,"3":236}}
+    234:234:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):162:162 -> a
+    235:235:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):162:162 -> a
+    236:236:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):162:162 -> a
+    203:203:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):162:162 -> a
+    204:206:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):156:158 -> a
+    207:208:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:151 -> a
+    209:210:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144:145 -> a
+    211:211:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):139:139 -> a
+    237:247: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):169:179 -> a
+    248:248: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":439,"2":440,"3":441}}
+    439:439: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):179:179 -> a
+    440:440: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):179:179 -> a
+    441:441: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):179:179 -> a
+    427:427: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):179:179 -> a
+    428:428: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):177:177 -> a
+    429:429: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):175:175 -> a
+    430:430: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):173:173 -> a
+    431:431: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):171:171 -> a
+    442:470: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):190:218 -> a
+    471:471: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":702,"2":703,"3":704}}
+    702:702: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):218:218 -> a
+    703:703: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):218:218 -> a
+    704:704: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):218:218 -> a
+    689:689: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):218:218 -> a
+    690:694: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):204:208 -> a
+    695:696:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):111:112 -> a
+    695:696: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):206 -> a
+    697:697: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):194:194 -> a
+    698:698:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    698:698: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):194 -> a
+    699:699: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):215:215 -> a
+    700:700: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):199:199 -> a
+    701:701:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    701:701: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):199 -> a
+    1:1:com.android.tools.r8.graph.DexField lambda$specify$1(com.android.tools.r8.cf.code.CfFieldInstruction):39:39 -> b
+    1:1:com.android.tools.r8.graph.DexField lambda$specify$2(com.android.tools.r8.cf.code.CfFieldInstruction):39:39 -> c
     com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> f
-    1:1:com.android.tools.r8.graph.DexField getField():70:70 -> getField
+    1:1:com.android.tools.r8.graph.DexField getField():69:69 -> getField
     boolean canThrow() -> q
-    1:1:int getCompareToId():79:79 -> s
+    1:1:int getCompareToId():78:78 -> s
     boolean isFieldInstruction() -> v
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.m7:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.l7:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> b
     java.util.Deque stack -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):359:363 -> <init>
-    1:2:int computeStackSize():413:414 -> F
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():377:377 -> G
-    1:1:java.util.Deque getStack():387:387 -> H
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):358:362 -> <init>
+    1:2:int computeStackSize():412:413 -> F
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():376:376 -> G
+    1:1:java.util.Deque getStack():386:386 -> H
     1:1:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
     1:1:com.android.tools.r8.cf.code.CfFrame markInstantiated(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):503 -> a
     2:10:com.android.tools.r8.cf.code.CfFrame markInstantiated(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):507:515 -> a
     11:11:com.android.tools.r8.cf.code.CfFrame markInstantiated(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):504:504 -> a
-    12:12:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):181:181 -> a
-    13:13:int com.android.tools.r8.cf.code.CfFrame.computeStackCount():408:408 -> a
-    13:13: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):400 -> a
-    14:21:java.lang.Object[] com.android.tools.r8.cf.code.CfFrame.computeStackTypes(int,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):420:427 -> a
-    14:21: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):401 -> a
-    22:31:int com.android.tools.r8.cf.code.CfFrame.computeLocalsCount():433:442 -> a
-    22:31: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):402 -> a
-    32:39:java.lang.Object[] com.android.tools.r8.cf.code.CfFrame.computeLocalsTypes(int,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):453:460 -> a
-    32:39: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):403 -> a
-    40:40: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):404:404 -> a
-    41:41:void print(com.android.tools.r8.cf.CfPrinter):474:474 -> a
-    42:42:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):479:479 -> a
-    43:43: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):490:490 -> a
-    44:44:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):499:499 -> a
+    12:12:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):180:180 -> a
+    13:13:int com.android.tools.r8.cf.code.CfFrame.computeStackCount():407:407 -> a
+    13:13: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):399 -> a
+    14:21:java.lang.Object[] com.android.tools.r8.cf.code.CfFrame.computeStackTypes(int,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):419:426 -> a
+    14:21: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):400 -> a
+    22:31:int com.android.tools.r8.cf.code.CfFrame.computeLocalsCount():432:441 -> a
+    22:31: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):401 -> a
+    32:39:java.lang.Object[] com.android.tools.r8.cf.code.CfFrame.computeLocalsTypes(int,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):452:459 -> a
+    32:39: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):402 -> a
+    40:40: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):403:403 -> a
+    41:41:void print(com.android.tools.r8.cf.CfPrinter):473:473 -> a
+    42:42:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):478:478 -> a
+    43:43: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):489:489 -> a
+    44:44: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):499:499 -> a
     45:45:com.android.tools.r8.cf.code.CfFrame$FrameType getInitializedFrameType(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):519:519 -> a
     46:46:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
     46:46:com.android.tools.r8.cf.code.CfFrame$FrameType getInitializedFrameType(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):519 -> a
@@ -6395,34 +6396,34 @@
     56:84:com.android.tools.r8.cf.code.CfFrame map(java.util.function.Function):536:564 -> a
     com.android.tools.r8.cf.code.CfFrame asFrame() -> g
     int getCompareToId() -> s
-    1:1:java.lang.String toString():469:469 -> toString
+    1:1:java.lang.String toString():468:468 -> toString
     boolean isFrame() -> w
-com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.f7:
-    1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):41:41 -> <init>
-    2:2:void <init>():127:127 -> <init>
+com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.e7:
+    1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):40:40 -> <init>
+    2:2:void <init>():126:126 -> <init>
     com.android.tools.r8.graph.DexType getInitializedType() -> a
     java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens) -> a
     1:1:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
-    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType map(java.util.function.Function):110 -> a
-    2:5:com.android.tools.r8.cf.code.CfFrame$FrameType map(java.util.function.Function):111:114 -> a
+    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType map(java.util.function.Function):109 -> a
+    2:5:com.android.tools.r8.cf.code.CfFrame$FrameType map(java.util.function.Function):110:113 -> a
     6:6:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> a
-    6:6:com.android.tools.r8.cf.code.CfFrame$FrameType map(java.util.function.Function):117 -> a
-    7:10:com.android.tools.r8.cf.code.CfFrame$FrameType map(java.util.function.Function):118:121 -> a
-    11:11:com.android.tools.r8.cf.code.CfFrame$FrameType initialized(com.android.tools.r8.graph.DexType):44:44 -> a
-    12:12:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):48:48 -> a
-    13:35:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):130:152 -> a
-    36:36:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.twoWord():64:64 -> a
-    36:36:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):150 -> a
-    37:37:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    37:37:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):148 -> a
-    38:38:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):146:146 -> a
-    39:39:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):144:144 -> a
-    40:40:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):142:142 -> a
-    41:41:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):140:140 -> a
-    42:42:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):138:138 -> a
-    43:43:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):136:136 -> a
-    44:44:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):134:134 -> a
-    45:45:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):132:132 -> a
+    6:6:com.android.tools.r8.cf.code.CfFrame$FrameType map(java.util.function.Function):116 -> a
+    7:10:com.android.tools.r8.cf.code.CfFrame$FrameType map(java.util.function.Function):117:120 -> a
+    11:11:com.android.tools.r8.cf.code.CfFrame$FrameType initialized(com.android.tools.r8.graph.DexType):43:43 -> a
+    12:12:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):47:47 -> a
+    13:35:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):129:151 -> a
+    36:36:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.twoWord():63:63 -> a
+    36:36:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):149 -> a
+    37:37:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    37:37:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):147 -> a
+    38:38:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):145:145 -> a
+    39:39:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):143:143 -> a
+    40:40:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):141:141 -> a
+    41:41:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):139:139 -> a
+    42:42:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):137:137 -> a
+    43:43:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
+    44:44:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):133:133 -> a
+    45:45:com.android.tools.r8.cf.code.CfFrame$FrameType fromMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):131:131 -> a
     com.android.tools.r8.cf.code.CfLabel getUninitializedLabel() -> b
     com.android.tools.r8.graph.DexType getUninitializedNewType() -> c
     boolean isInitialized() -> d
@@ -6430,251 +6431,257 @@
     boolean isUninitializedNew() -> f
     boolean isUninitializedThis() -> g
     boolean isWide() -> h
-    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType top():56:56 -> i
-    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType uninitializedThis():52:52 -> j
-com.android.tools.r8.cf.code.CfFrame$InitializedType -> com.android.tools.r8.internal.g7:
+    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.f7:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():184:184 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfFrame$1):184:184 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexType):188:190 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):200:200 -> a
+    1:1:void <clinit>():183:183 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfFrame$1):183:183 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexType):187:189 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):199:199 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":446,"2":447,"3":448}}
-    446:446:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):200:200 -> a
-    447:447:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    447:447:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):200 -> a
-    448:448:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    448:448:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):200 -> a
-    203:218:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):201:216 -> a
-    219:219:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":449,"2":450,"3":451,"4":452,"5":453}}
-    449:449:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):216:216 -> a
-    450:450:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):216:216 -> a
-    451:451:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):216:216 -> a
-    452:452:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):216:216 -> a
-    453:453:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):216:216 -> a
-    435:435:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):216:216 -> a
-    436:436:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):208:208 -> a
-    437:445:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):206:214 -> a
-    454:454:com.android.tools.r8.graph.DexType getInitializedType():232:232 -> a
-    1:1:boolean isWide():222:222 -> h
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":444,"2":445,"3":446}}
+    444:444:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):199:199 -> a
+    445:445:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    445:445:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):199 -> a
+    446:446:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    446:446:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):199 -> a
+    202:217:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):200:215 -> a
+    218:218:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":447,"2":448,"3":449,"4":450,"5":451}}
+    447:447:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):215:215 -> a
+    448:448:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):215:215 -> a
+    449:449:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):215:215 -> a
+    450:450:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):215:215 -> a
+    451:451:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):215:215 -> a
+    433:433:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):215:215 -> a
+    434:434:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):207:207 -> a
+    435:443:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):205:213 -> a
+    452:452:com.android.tools.r8.graph.DexType getInitializedType():231:231 -> a
+    1:1:boolean isWide():221:221 -> h
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":197,"2":198,"3":199}}
-    197:197:java.lang.String toString():195:195 -> toString
-    198:198:java.lang.String toString():195:195 -> toString
-    199:199:java.lang.String toString():195:195 -> toString
-    196:196:java.lang.String toString():195:195 -> toString
-com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.h7:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":196,"2":197,"3":198}}
+    196:196:java.lang.String toString():194:194 -> toString
+    197:197:java.lang.String toString():194:194 -> toString
+    198:198:java.lang.String toString():194:194 -> toString
+    195:195:java.lang.String toString():194:194 -> toString
+com.android.tools.r8.cf.code.CfFrame$OneWord -> com.android.tools.r8.internal.g7:
     com.android.tools.r8.cf.code.CfFrame$OneWord SINGLETON -> a
-    1:1:void <clinit>():313:313 -> <clinit>
-    1:1:void <init>():311:311 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):317:317 -> a
-    1:1:com.android.tools.r8.cf.code.CfFrame$OneWord access$400():311:311 -> k
-    1:1:java.lang.String toString():327:327 -> toString
-com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.i7:
+    1:1:void <clinit>():312:312 -> <clinit>
+    1:1:void <init>():310:310 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):316:316 -> a
+    1:1:com.android.tools.r8.cf.code.CfFrame$OneWord access$400():310:310 -> k
+    1:1:java.lang.String toString():326:326 -> toString
+com.android.tools.r8.cf.code.CfFrame$Top -> com.android.tools.r8.internal.h7:
     com.android.tools.r8.cf.code.CfFrame$Top SINGLETON -> a
-    1:1:void <clinit>():238:238 -> <clinit>
-    1:1:void <init>():236:236 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):247:247 -> a
-    1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():236:236 -> k
-    1:1:java.lang.String toString():242:242 -> toString
-com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.j7:
+    1:1:void <clinit>():237:237 -> <clinit>
+    1:1:void <init>():235:235 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):246:246 -> a
+    1:1:com.android.tools.r8.cf.code.CfFrame$Top access$300():235:235 -> k
+    1:1:java.lang.String toString():241:241 -> toString
+com.android.tools.r8.cf.code.CfFrame$TwoWord -> com.android.tools.r8.internal.i7:
     com.android.tools.r8.cf.code.CfFrame$TwoWord SINGLETON -> a
-    1:1:void <clinit>():333:333 -> <clinit>
-    1:1:void <init>():331:331 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):337:337 -> a
-    1:1:com.android.tools.r8.cf.code.CfFrame$TwoWord access$500():331:331 -> k
-    1:1:java.lang.String toString():352:352 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.k7:
+    1:1:void <clinit>():332:332 -> <clinit>
+    1:1:void <init>():330:330 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):336:336 -> a
+    1:1:com.android.tools.r8.cf.code.CfFrame$TwoWord access$500():330:330 -> k
+    1:1:java.lang.String toString():351:351 -> toString
+com.android.tools.r8.cf.code.CfFrame$UninitializedNew -> com.android.tools.r8.internal.j7:
     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):256:256 -> <init>
-    2:4:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):260:262 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):272:272 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():282:282 -> b
-    1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():287:287 -> c
-    1:1:java.lang.String toString():267:267 -> toString
-com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.l7:
-    1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):291:291 -> <init>
-    2:2:void <init>():293:293 -> <init>
-    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):297:297 -> a
-    1:1:java.lang.String toString():302:302 -> toString
-com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.n7:
-    java.util.Set tryCatchRangeLabels -> i
+    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):255:255 -> <init>
+    2:4:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):259:261 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):271:271 -> a
+    1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():281:281 -> b
+    1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():286:286 -> c
+    1:1:java.lang.String toString():266:266 -> toString
+com.android.tools.r8.cf.code.CfFrame$UninitializedThis -> com.android.tools.r8.internal.k7:
+    1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):290:290 -> <init>
+    2:2:void <init>():292:292 -> <init>
+    1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):296:296 -> a
+    1:1:java.lang.String toString():301:301 -> toString
+com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.m7:
     java.util.Map stateMap -> d
+    com.android.tools.r8.graph.GraphLens graphLens -> g
+    java.util.Set tryCatchRangeLabels -> j
     com.android.tools.r8.graph.DexItemFactory factory -> f
-    java.util.Deque currentCatchRanges -> h
-    boolean $assertionsDisabled -> j
+    int maxStackHeight -> h
+    boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexType context -> c
-    int maxStackHeight -> g
+    java.util.Deque currentCatchRanges -> i
     com.android.tools.r8.cf.code.CfFrame NO_FRAME -> a
     java.util.function.BiPredicate isJavaAssignable -> e
     com.android.tools.r8.cf.code.CfFrame currentFrame -> b
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,java.util.Map,java.util.List,java.util.function.BiPredicate,com.android.tools.r8.graph.DexItemFactory,int):53:53 -> <init>
-    2:37:void <init>(com.android.tools.r8.graph.DexType,java.util.Map,java.util.List,java.util.function.BiPredicate,com.android.tools.r8.graph.DexItemFactory,int):30:65 -> <init>
-    1:9:com.android.tools.r8.cf.code.CfFrame$FrameType readLocal(int,com.android.tools.r8.graph.DexType):74:82 -> a
-    10:10:com.android.tools.r8.cf.code.CfFrame$FrameType readLocal(int,com.android.tools.r8.graph.DexType):79:79 -> a
-    11:11:com.android.tools.r8.cf.code.CfFrame$FrameType readLocal(int,com.android.tools.r8.graph.DexType):77:77 -> a
-    12:13:void storeLocal(int,com.android.tools.r8.cf.code.CfFrame$FrameType):90:91 -> a
-    14:15:com.android.tools.r8.cf.code.CfFrameVerificationHelper popAndDiscardInitialized(com.android.tools.r8.graph.DexType):113:114 -> a
-    16:18:com.android.tools.r8.cf.code.CfFrameVerificationHelper popAndDiscardInitialized(com.android.tools.r8.graph.DexType[]):119:121 -> a
-    19:21:com.android.tools.r8.cf.code.CfFrameVerificationHelper popAndDiscard(com.android.tools.r8.cf.code.CfFrame$FrameType[]):133:135 -> a
-    22:23:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    22:23:com.android.tools.r8.cf.code.CfFrameVerificationHelper popAndDiscard(com.android.tools.r8.cf.code.CfFrame$FrameType[]):135 -> a
-    24:28:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):141:145 -> a
-    29:30:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):107:108 -> a
-    29:30:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):143 -> a
-    31:33:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):146:148 -> a
-    34:34:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> a
-    34:34:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):148 -> a
-    35:35:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):147:147 -> a
-    36:36:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.setNoFrame():256:256 -> a
-    36:36:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):149 -> a
-    37:37:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):150:150 -> a
-    38:40:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):154:156 -> a
-    41:41:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":206,"2":207,"3":208}}
-    206:206:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):157:157 -> a
-    207:207:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):157:157 -> a
-    208:208:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):157:157 -> a
-    198:205:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):157:157 -> a
-    209:219:void checkExceptionEdges():215:225 -> a
-    220:220:void checkExceptionEdges():224:224 -> a
-    221:221:void checkExceptionEdges():219:219 -> a
-    222:222:void checkTarget(com.android.tools.r8.cf.code.CfLabel):235:235 -> a
-    223:223:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242:242 -> a
-    224:226:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246:248 -> a
-    224:226:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    227:227:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):304:304 -> a
-    227:227:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    227:227:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    228:240:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):349:361 -> a
-    228:240:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    228:240:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    228:240:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    241:241:void checkFrame(com.android.tools.r8.cf.code.CfFrame):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":252,"2":253,"3":254}}
-    252:252:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):362:362 -> a
-    252:252:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    252:252:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    252:252:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    253:253:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):362:362 -> a
-    253:253:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    253:253:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    253:253:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    254:254:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):362:362 -> a
-    254:254:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    254:254:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    254:254:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    242:244:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):364:366 -> a
-    242:244:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    242:244:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    242:244:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    245:245:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):362:362 -> a
-    245:245:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    245:245:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    245:245:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    246:246:void checkFrame(com.android.tools.r8.cf.code.CfFrame):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":255,"2":256,"3":257}}
-    255:255:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):350:350 -> a
-    255:255:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    255:255:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    255:255:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    256:256:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):350:350 -> a
-    256:256:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    256:256:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    256:256:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    257:257:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):350:350 -> a
-    257:257:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    257:257:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    257:257:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    247:249:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):352:354 -> a
-    247:249:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    247:249:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    247:249:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    250:250:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):350:350 -> a
-    250:250:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):305 -> a
-    250:250:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):246 -> a
-    250:250:void checkFrame(com.android.tools.r8.cf.code.CfFrame):242 -> a
-    251:251:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240:240 -> a
-    258:258:boolean isAssignableAndInitialized(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):274:274 -> a
-    259:259:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
-    259:259:boolean isAssignableAndInitialized(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):274 -> a
-    260:260:boolean isAssignableAndInitialized(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):277:277 -> a
-    261:265:void checkIsAssignable(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):282:286 -> a
-    266:266:void checkIsAssignable(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):285:285 -> a
-    267:268:void checkIsAssignable(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType):290:291 -> a
-    269:280:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):313:324 -> a
-    281:281:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.top():56:56 -> a
-    281:281:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):324 -> a
-    282:282:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):326:326 -> a
-    283:283:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.top():56:56 -> a
-    283:283:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):326 -> a
-    284:284:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):327:327 -> a
-    285:285:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":952,"2":953,"3":954}}
-    952:952:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):328:328 -> a
-    953:953:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):328:328 -> a
-    954:954:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):328:328 -> a
-    615:617:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):330:332 -> a
-    618:618:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):328:328 -> a
-    619:619:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":955,"2":956,"3":957}}
-    955:955:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):316:316 -> a
-    956:956:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):316:316 -> a
-    957:957:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):316:316 -> a
-    937:939:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):318:320 -> a
-    940:940:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):316:316 -> a
-    958:958:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):385:385 -> a
-    959:959:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isTop():0:0 -> a
-    959:959:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):385 -> a
-    960:960:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):388:388 -> a
-    961:961:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isTop():0:0 -> a
-    961:961:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):388 -> a
-    962:962:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):391:391 -> a
-    963:963:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isOneWord():0:0 -> a
-    963:963:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):394 -> a
-    964:964:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isTwoWord():0:0 -> a
-    964:964:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):394 -> a
-    965:966:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedThis():0:0 -> a
-    965:966:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):397 -> a
-    967:968:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> a
-    967:968:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):400 -> a
-    969:970:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):402:403 -> a
-    971:971:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
-    971:971:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):409 -> a
-    972:972:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
-    972:972:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):410 -> a
-    973:973:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):411:411 -> a
-    974:974:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
-    974:974:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):414 -> a
-    975:975:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):416:416 -> a
-    1:1:com.android.tools.r8.cf.code.CfFrame$FrameType popInitialized(com.android.tools.r8.graph.DexType):103:103 -> b
-    2:3:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):107:108 -> b
-    2:3:com.android.tools.r8.cf.code.CfFrame$FrameType popInitialized(com.android.tools.r8.graph.DexType):103 -> b
-    4:5:void checkFrameIsSet():195:196 -> b
-    6:7:void checkFrameAndSet(com.android.tools.r8.cf.code.CfFrame):201:202 -> b
-    8:11:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.setFrame(com.android.tools.r8.cf.code.CfFrame):208:211 -> b
-    8:11:void checkFrameAndSet(com.android.tools.r8.cf.code.CfFrame):204 -> b
-    12:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):167:168 -> b
-    12:13:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.setFrame(com.android.tools.r8.cf.code.CfFrame):211 -> b
-    12:13:void checkFrameAndSet(com.android.tools.r8.cf.code.CfFrame):204 -> b
-    14:14:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.setFrame(com.android.tools.r8.cf.code.CfFrame):211:211 -> b
-    14:14:void checkFrameAndSet(com.android.tools.r8.cf.code.CfFrame):204 -> b
-    15:15:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):267:267 -> b
-    16:16:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> b
-    16:16:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):267 -> b
-    17:17:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):270:270 -> b
-    1:5:com.android.tools.r8.cf.code.CfFrame$FrameType pop():95:99 -> c
-    6:6:com.android.tools.r8.cf.code.CfFrame$FrameType pop():97:97 -> c
-    7:7:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):260:260 -> c
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,java.util.Map,java.util.List,java.util.function.BiPredicate,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,int):56:56 -> <init>
+    2:40:void <init>(com.android.tools.r8.graph.DexType,java.util.Map,java.util.List,java.util.function.BiPredicate,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,int):31:69 -> <init>
+    1:9:com.android.tools.r8.cf.code.CfFrame$FrameType readLocal(int,com.android.tools.r8.graph.DexType):78:86 -> a
+    10:10:com.android.tools.r8.cf.code.CfFrame$FrameType readLocal(int,com.android.tools.r8.graph.DexType):83:83 -> a
+    11:11:com.android.tools.r8.cf.code.CfFrame$FrameType readLocal(int,com.android.tools.r8.graph.DexType):81:81 -> a
+    12:13:void storeLocal(int,com.android.tools.r8.cf.code.CfFrame$FrameType):94:95 -> a
+    14:14:com.android.tools.r8.cf.code.CfFrame$FrameType popInitialized(com.android.tools.r8.graph.DexType):107:107 -> a
+    15:16:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):111:112 -> a
+    15:16:com.android.tools.r8.cf.code.CfFrame$FrameType popInitialized(com.android.tools.r8.graph.DexType):107 -> a
+    17:19:com.android.tools.r8.cf.code.CfFrameVerificationHelper popAndDiscardInitialized(com.android.tools.r8.graph.DexType[]):117:119 -> a
+    20:22:com.android.tools.r8.cf.code.CfFrameVerificationHelper popAndDiscard(com.android.tools.r8.cf.code.CfFrame$FrameType[]):131:133 -> a
+    23:24: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
+    23:24:com.android.tools.r8.cf.code.CfFrameVerificationHelper popAndDiscard(com.android.tools.r8.cf.code.CfFrame$FrameType[]):133 -> a
+    25:29:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):139:143 -> a
+    30:31:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):111:112 -> a
+    30:31:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):141 -> a
+    32:34:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):144:146 -> a
+    35:35:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> a
+    35:35:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):146 -> a
+    36:36:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):145:145 -> a
+    37:37:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.setNoFrame():254:254 -> a
+    37:37:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):147 -> a
+    38:38:void popAndInitialize(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):148:148 -> a
+    39:41:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):152:154 -> a
+    42:42:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":205,"2":206,"3":207}}
+    205:205:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):155:155 -> a
+    206:206:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):155:155 -> a
+    207:207:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):155:155 -> a
+    197:204:com.android.tools.r8.cf.code.CfFrameVerificationHelper push(com.android.tools.r8.cf.code.CfFrame$FrameType):155:155 -> a
+    208:218:void checkExceptionEdges():213:223 -> a
+    219:219:void checkExceptionEdges():222:222 -> a
+    220:220:void checkExceptionEdges():217:217 -> a
+    221:221:void checkTarget(com.android.tools.r8.cf.code.CfLabel):233:233 -> a
+    222:222:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240:240 -> a
+    223:225:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244:246 -> a
+    223:225:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    226:226:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):302:302 -> a
+    226:226:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    226:226:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    227:239:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):347:359 -> a
+    227:239:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    227:239:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    227:239:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    240:240:void checkFrame(com.android.tools.r8.cf.code.CfFrame):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":251,"2":252,"3":253}}
+    251:251:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):360:360 -> a
+    251:251:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    251:251:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    251:251:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    252:252:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):360:360 -> a
+    252:252:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    252:252:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    252:252:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    253:253:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):360:360 -> a
+    253:253:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    253:253:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    253:253:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    241:243:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):362:364 -> a
+    241:243:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    241:243:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    241:243:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    244:244:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):360:360 -> a
+    244:244:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    244:244:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    244:244:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    245:245:void checkFrame(com.android.tools.r8.cf.code.CfFrame):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":254,"2":255,"3":256}}
+    254:254:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):348:348 -> a
+    254:254:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    254:254:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    254:254:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    255:255:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):348:348 -> a
+    255:255:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    255:255:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    255:255:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    256:256:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):348:348 -> a
+    256:256:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    256:256:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    256:256:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    246:248:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):350:352 -> a
+    246:248:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    246:248:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    246:248:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    249:249:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkStackIsAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):348:348 -> a
+    249:249:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):303 -> a
+    249:249:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkFrame(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,java.util.Deque):244 -> a
+    249:249:void checkFrame(com.android.tools.r8.cf.code.CfFrame):240 -> a
+    250:250:void checkFrame(com.android.tools.r8.cf.code.CfFrame):238:238 -> a
+    257:257:boolean isAssignableAndInitialized(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):272:272 -> a
+    258:258:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
+    258:258:boolean isAssignableAndInitialized(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):272 -> a
+    259:259:boolean isAssignableAndInitialized(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):275:275 -> a
+    260:264:void checkIsAssignable(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):280:284 -> a
+    265:265:void checkIsAssignable(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType,java.util.function.BiPredicate):283:283 -> a
+    266:267:void checkIsAssignable(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType):288:289 -> a
+    268:279:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):311:322 -> a
+    280:280:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.top():55:55 -> a
+    280:280:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):322 -> a
+    281:281:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):324:324 -> a
+    282:282:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.top():55:55 -> a
+    282:282:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):324 -> a
+    283:283:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):325:325 -> a
+    284:284:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":947,"2":948,"3":949}}
+    947:947:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):326:326 -> a
+    948:948:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):326:326 -> a
+    949:949:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):326:326 -> a
+    612:614:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):328:330 -> a
+    615:615:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):326:326 -> a
+    616:616:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":950,"2":951,"3":952}}
+    950:950:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):314:314 -> a
+    951:951:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):314:314 -> a
+    952:952:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):314:314 -> a
+    932:934:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):316:318 -> a
+    935:935:void checkLocalsIsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):314:314 -> a
+    953:953:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):383:383 -> a
+    954:954:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isTop():0:0 -> a
+    954:954:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):383 -> a
+    955:955:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):386:386 -> a
+    956:956:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isTop():0:0 -> a
+    956:956:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):386 -> a
+    957:957:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):389:389 -> a
+    958:958:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isOneWord():0:0 -> a
+    958:958:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):392 -> a
+    959:959:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isTwoWord():0:0 -> a
+    959:959:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):392 -> a
+    960:961:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedThis():0:0 -> a
+    960:961:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):395 -> a
+    962:963:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> a
+    962:963:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):398 -> a
+    964:965:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):400:401 -> a
+    966:966:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
+    966:966:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):407 -> a
+    967:967:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
+    967:967:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):408 -> a
+    968:968:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):409:409 -> a
+    969:969:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isInitialized():0:0 -> a
+    969:969:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):412 -> a
+    970:970:boolean canBeAssigned(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiPredicate):414:414 -> a
+    1:2:void checkFrameIsSet():193:194 -> b
+    3:4:void checkFrameAndSet(com.android.tools.r8.cf.code.CfFrame):199:200 -> b
+    5:8:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.setFrame(com.android.tools.r8.cf.code.CfFrame):206:209 -> b
+    5:8:void checkFrameAndSet(com.android.tools.r8.cf.code.CfFrame):202 -> b
+    9:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):167:168 -> b
+    9:10:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.setFrame(com.android.tools.r8.cf.code.CfFrame):209 -> b
+    9:10:void checkFrameAndSet(com.android.tools.r8.cf.code.CfFrame):202 -> b
+    11:11:void com.android.tools.r8.cf.code.CfFrameVerificationHelper.setFrame(com.android.tools.r8.cf.code.CfFrame):209:209 -> b
+    11:11:void checkFrameAndSet(com.android.tools.r8.cf.code.CfFrame):202 -> b
+    12:12:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):265:265 -> b
+    13:13:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> b
+    13:13:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):265 -> b
+    14:14:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):268:268 -> b
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):392:392 -> b
+    15:15:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):268 -> b
+    16:16:boolean isUninitializedNewAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):268:268 -> b
+    1:5:com.android.tools.r8.cf.code.CfFrame$FrameType pop():99:103 -> c
+    6:6:com.android.tools.r8.cf.code.CfFrame$FrameType pop():101:101 -> c
+    7:7:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):258:258 -> c
     8:8:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedThis():0:0 -> c
-    8:8:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):260 -> c
-    9:9:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):263:263 -> c
-    1:1:void setNoFrame():256:256 -> d
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.o7:
+    8:8:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):258 -> c
+    9:9:boolean isUninitializedThisAndTarget(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):261:261 -> c
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):392:392 -> c
+    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.n7:
     com.android.tools.r8.cf.code.CfLabel target -> b
     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
@@ -6686,12 +6693,12 @@
     4:4: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):75:75 -> a
     5:5:void print(com.android.tools.r8.cf.CfPrinter):80:80 -> 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):85:85 -> a
-    7:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):100:101 -> a
+    7: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):101:102 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
     9:9: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):91 -> a
     int getCompareToId() -> s
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():62:62 -> t
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.q7:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.p7:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
     boolean $assertionsDisabled -> e
@@ -6702,10 +6709,10 @@
     1:1:com.android.tools.r8.ir.code.If$Type getKind():61:61 -> F
     1:15:int getOpcode():70:84 -> G
     16:16:int getOpcode():0:0 -> G
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":114,"2":115,"3":116}}
-    114:114:int getOpcode():84:84 -> G
-    115:115:int getOpcode():84:84 -> G
-    116:116:int getOpcode():84:84 -> G
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":103,"2":104,"3":105}}
+    103:103:int getOpcode():84:84 -> G
+    104:104:int getOpcode():84:84 -> G
+    105:105:int getOpcode():84:84 -> G
     100:100:int getOpcode():84:84 -> G
     101:101:int getOpcode():82:82 -> G
     102:102:int getOpcode():72:72 -> G
@@ -6723,57 +6730,57 @@
     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):121 -> a
     14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int):1438:1438 -> 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):121 -> a
-    15:17:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):139:141 -> a
-    18:22:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):138:142 -> a
-    23:23:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
-    23:23: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):127 -> a
+    15:17: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):139:139 -> a
+    19:19: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):141:141 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
+    20:20: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):127 -> a
     1:1:int getCompareToId():44:44 -> s
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():66:66 -> t
-com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.p7:
+com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.o7:
     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.s7:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.r7:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.cf.code.CfLabel target -> d
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):37:40 -> <init>
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):36:39 -> <init>
     boolean isJump() -> C
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():58:58 -> F
-    1:15:int getOpcode():71:85 -> G
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():57:57 -> F
+    1:15:int getOpcode():70:84 -> G
     16:16:int getOpcode():0:0 -> G
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":115,"2":116,"3":117}}
-    115:115:int getOpcode():85:85 -> G
-    116:116:int getOpcode():85:85 -> G
-    117:117:int getOpcode():85:85 -> G
-    101:101:int getOpcode():85:85 -> G
-    102:102:int getOpcode():83:83 -> G
-    103:103:int getOpcode():73:73 -> G
-    1:1:com.android.tools.r8.ir.code.ValueType getType():62:62 -> H
-    1:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):51:54 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":103,"2":104,"3":105}}
+    103:103:int getOpcode():84:84 -> G
+    104:104:int getOpcode():84:84 -> G
+    105:105:int getOpcode():84:84 -> G
+    100:100:int getOpcode():84:84 -> G
+    101:101:int getOpcode():82:82 -> G
+    102:102:int getOpcode():72:72 -> G
+    1:1:com.android.tools.r8.ir.code.ValueType getType():61:61 -> H
+    1:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):50:53 -> a
     5:5:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
-    5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):54 -> a
+    5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):53 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> a
-    6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):54 -> a
-    7:7:void print(com.android.tools.r8.cf.CfPrinter):91:91 -> a
-    8:8: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):104:104 -> a
-    9:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):119:123 -> a
+    6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):53 -> a
+    7:7:void print(com.android.tools.r8.cf.CfPrinter):90:90 -> a
+    8:8: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
+    9:13: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
     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):1411:1411 -> 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):123 -> 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: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):1409:1409 -> a
-    15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):123 -> a
-    16:20:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):141:145 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
-    21:21: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):129 -> a
-    1:1:int getCompareToId():45:45 -> s
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():67:67 -> t
+    15:15: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
+    16:18: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):141:143 -> a
+    19:19:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
+    19:19: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 -> a
+    1:1:int getCompareToId():44:44 -> s
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():66:66 -> t
     boolean isConditionalJump() -> u
-com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.r7:
+com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.q7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():71:71 -> <clinit>
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.t7:
+    1:1:void <clinit>():70:70 -> <clinit>
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.s7:
     int var -> b
     int increment -> c
     1:3:void <init>(int,int):37:39 -> <init>
@@ -6785,59 +6792,59 @@
     4:4:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> a
     5:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81:82 -> 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):88:88 -> a
-    8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):97:97 -> 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() -> s
-com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.u7:
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.t7:
     com.android.tools.r8.graph.DexType clazz -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexType):36:37 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getClassValue():41:41 -> F
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):56:56 -> 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 -> F
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):55:55 -> a
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> 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):56 -> a
-    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):76:76 -> 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):55 -> a
+    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):75:75 -> a
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    4:4: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):76 -> a
-    5:9: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):77:81 -> a
-    10:10:void print(com.android.tools.r8.cf.CfPrinter):86:86 -> a
-    11:11:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):92:92 -> a
-    12:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):102:103 -> a
-    14:14: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):109:109 -> a
-    15:15:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):120:120 -> a
-    16:16:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    16:16:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):120 -> a
+    4:4: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):75 -> a
+    5:9: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):76:80 -> a
+    10:10:void print(com.android.tools.r8.cf.CfPrinter):85:85 -> a
+    11:11:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):91:91 -> a
+    12:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):101:102 -> a
+    14:14: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):108:108 -> a
+    15:15: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:120 -> a
+    16:16:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    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() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.v7:
+com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.u7:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):21:21 -> <init>
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):27:27 -> a
-com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.v7:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):20:20 -> <init>
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):26:26 -> a
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.x7:
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.w7:
     com.android.tools.r8.graph.DexType type -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
     boolean isTypeInstruction() -> E
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):66:66 -> 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):65:65 -> a
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> 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):66 -> a
-    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):89:89 -> 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):65 -> a
+    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):88:88 -> a
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    4:4: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):89 -> a
-    5:5: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
-    6:6:void print(com.android.tools.r8.cf.CfPrinter):95:95 -> a
-    7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):101:101 -> 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):111:113 -> 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):112:112 -> 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):119:119 -> a
-    13:13:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):130:130 -> a
-    14:14:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    14:14:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):130 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():50:50 -> getType
+    4:4: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):88 -> a
+    5:5: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):89:89 -> a
+    6:6:void print(com.android.tools.r8.cf.CfPrinter):94:94 -> a
+    7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):100:100 -> 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):110:112 -> 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):111:111 -> 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: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
+    14:14:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    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):130 -> a
+    1:1:com.android.tools.r8.graph.DexType getType():49:49 -> getType
     com.android.tools.r8.cf.code.CfInstanceOf asInstanceOf() -> h
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.y7:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.x7:
     1:1:void <init>():31:31 -> <init>
     boolean isInvokeStatic() -> A
     boolean isInvokeVirtual() -> B
@@ -6846,7 +6853,7 @@
     boolean isTypeInstruction() -> E
     com.android.tools.r8.cf.code.CfConstDynamic asConstDynamic() -> a
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
-    void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory) -> a
+    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
     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) -> a
     int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper) -> a
     void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator) -> a
@@ -6880,7 +6887,7 @@
     boolean isInvoke() -> x
     boolean isInvokeInterface() -> y
     boolean isInvokeSpecial() -> z
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.E7:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.D7:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> b
     int opcode -> c
@@ -7006,23 +7013,23 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1003:1004: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):280:281 -> a
     1005:1005: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):270:270 -> a
-    1006:1006:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):337:337 -> a
+    1006:1006:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):336:336 -> a
     1006:1006: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):270 -> a
-    1007:1007:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2856:2856 -> a
-    1007:1007:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):337 -> a
+    1007:1007:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2854:2854 -> a
+    1007:1007:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):336 -> a
     1007:1007: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):270 -> a
-    1008:1013:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):338:343 -> a
+    1008:1013:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):337:342 -> a
     1008:1013: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):270 -> a
-    1014:1015:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):348:349 -> a
-    1014:1015:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):343 -> a
+    1014:1015:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):347:348 -> a
+    1014:1015:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
     1014:1015: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):270 -> a
     1016:1016:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> a
-    1016:1016:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):349 -> a
+    1016:1016:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):348 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1016:1016:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):343 -> a
+    1016:1016:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
     1016:1016: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):270 -> a
-    1017:1032:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):350:365 -> a
-    1017:1032:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):343 -> a
+    1017:1032:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):349:364 -> a
+    1017:1032:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):342 -> a
     1017:1032: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):270 -> a
     1033:1033: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):271:271 -> a
     1034:1034:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> a
@@ -7051,63 +7058,63 @@
     1088:1088: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):308 -> a
     1089:1089:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.ProgramMethod):148:148 -> a
     1089:1089: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):308 -> a
-    1093:1102:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):322:331 -> a
-    1103:1103:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    1103:1103:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):331 -> a
+    1093:1099: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):323:329 -> a
+    1100:1100:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    1100:1100: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):330 -> a
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> i
     boolean canThrow() -> q
     1:1:int getCompareToId():63:63 -> s
     boolean isInvoke() -> x
     1:1:boolean isInvokeInterface():169:169 -> y
     1:1:boolean isInvokeSpecial():154:154 -> z
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.F7:
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.E7:
     com.android.tools.r8.graph.DexCallSite callSite -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexCallSite):44:45 -> <init>
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():126:126 -> F
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):66:66 -> a
-    2: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):79:84 -> a
-    8:27:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):96:115 -> a
-    8:27: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):84 -> 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 -> F
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):65:65 -> a
+    2: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):78:83 -> a
+    8:27:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):95:114 -> a
+    8:27: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 -> a
     28:28: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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52,"2":53,"3":54}}
-    52:52:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):115:115 -> a
-    52:52: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):84 -> a
-    53:53:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):115:115 -> a
-    53:53: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):84 -> a
-    54:54:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):115:115 -> a
-    54:54: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):84 -> a
-    29:29:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):116:116 -> a
-    29:29: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):84 -> a
-    30:30:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):113:113 -> a
-    30:30: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):84 -> a
-    31:32:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):110:111 -> a
-    31:32: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):84 -> a
-    33:35:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):106:108 -> a
-    33:35: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):84 -> a
-    36:42:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):98:104 -> a
-    36:42: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):84 -> a
-    43:43:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):102:102 -> a
-    43:43: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):84 -> a
-    44:50: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):84:90 -> a
-    51:51: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):88:88 -> a
-    55:55:void print(com.android.tools.r8.cf.CfPrinter):122:122 -> a
-    56:56:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):132:132 -> a
-    57:59:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):142:144 -> a
+    52:52:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):114:114 -> a
+    52:52: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 -> a
+    53:53:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):114:114 -> a
+    53:53: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 -> a
+    54:54:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):114:114 -> a
+    54:54: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 -> a
+    29:29:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):115:115 -> a
+    29:29: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 -> a
+    30:30:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):112:112 -> a
+    30:30: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 -> a
+    31:32:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):109:110 -> a
+    31:32: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 -> a
+    33:35:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):105:107 -> a
+    33:35: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 -> a
+    36:42:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):97:103 -> a
+    36:42: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 -> a
+    43:43:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):101:101 -> a
+    43:43: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 -> a
+    44:50: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:89 -> a
+    51:51: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):87:87 -> a
+    55:55:void print(com.android.tools.r8.cf.CfPrinter):121:121 -> a
+    56:56:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):131:131 -> a
+    57:59:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):141:143 -> a
     60:62:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):193:195 -> a
-    60:62:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144 -> a
-    63:72:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144:153 -> a
+    60:62:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):143 -> a
+    63:72:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):143:152 -> a
     73:73:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():168:168 -> a
-    73:73: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):160 -> a
-    74:75:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):171:172 -> a
-    76:76:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    76:76:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):173 -> a
+    73:73: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):159 -> a
+    74:75: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):171:172 -> a
+    76:76:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    76:76: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):173 -> a
     com.android.tools.r8.cf.code.CfInvokeDynamic asInvokeDynamic() -> j
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.G7:
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.F7:
     int local -> b
     1:2:void <init>(int):36:37 -> <init>
-    1:1:int getLocal():92:92 -> F
+    1:1:int getLocal():93:93 -> F
     1:1:com.android.tools.r8.errors.CompilationError com.android.tools.r8.cf.code.CfJsrRet.error():30:30 -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):71 -> a
     2:2:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -7153,7 +7160,7 @@
     16:16:com.android.tools.r8.errors.CompilationError com.android.tools.r8.cf.code.CfJsrRet.error():30:30 -> a
     16:16: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):61 -> a
     17:17:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> a
-    18:18:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):88:88 -> a
+    18:18: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:com.android.tools.r8.errors.CompilationError com.android.tools.r8.cf.code.CfJsrRet.error():30:30 -> s
     1:1:int getCompareToId():42 -> s
     2:2:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> s
@@ -7165,12 +7172,12 @@
     3:3:int getCompareToId():42 -> s
     4:4:com.android.tools.r8.errors.CompilationError com.android.tools.r8.cf.code.CfJsrRet.error():30:30 -> s
     4:4:int getCompareToId():42 -> s
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.H7:
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.G7:
     com.android.tools.r8.org.objectweb.asm.Label label -> b
     1:3:void <init>():26:28 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():31:34 -> F
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
-    void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory) -> a
+    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):45:45 -> a
     2:2:int com.android.tools.r8.graph.CfCompareHelper.compareLabels(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.utils.structural.CompareToVisitor):80:80 -> 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):45 -> a
@@ -7183,7 +7190,7 @@
     com.android.tools.r8.cf.code.CfLabel asLabel() -> k
     boolean emitsIR() -> r
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.M7:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.L7:
     com.android.tools.r8.ir.code.ValueType type -> c
     int var -> b
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):34:36 -> <init>
@@ -7205,15 +7212,15 @@
     17:17: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):87:87 -> a
     21:21:void print(com.android.tools.r8.cf.CfPrinter):92:92 -> a
     22:22:int com.android.tools.r8.cf.code.CfLoad.getLocalIndex():100:100 -> a
-    22:22:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):131 -> a
-    23:25:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):132:134 -> a
-    26:26:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):130:130 -> a
-    27:27:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):129:129 -> a
-    28:30: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
-    31:31:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1301:1301 -> a
-    31:31: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
-    32:32:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():271:271 -> a
-    32:32: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 -> a
+    22:22: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 -> a
+    23:23: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):133:133 -> a
+    24:24: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
+    25:25: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
+    26:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):105:107 -> a
+    29:29:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1301:1301 -> a
+    29:29: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
+    30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forLoad():271:271 -> a
+    30:30: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 -> a
     com.android.tools.r8.cf.code.CfLoad asLoad() -> l
     boolean emitsIR() -> r
     1:13:int com.android.tools.r8.cf.code.CfLoad.getLoadType():51:63 -> s
@@ -7228,10 +7235,10 @@
     18:18:int getCompareToId():41 -> s
     15:15:int com.android.tools.r8.cf.code.CfLoad.getLoadType():63:63 -> s
     15:15:int getCompareToId():41 -> s
-com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.L7:
+com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.K7:
     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.O7:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.N7:
     com.android.tools.r8.ir.code.NumericType type -> c
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> b
     boolean $assertionsDisabled -> d
@@ -7239,10 +7246,10 @@
     1:6:void <init>(com.android.tools.r8.cf.code.CfLogicalBinop$Opcode,com.android.tools.r8.ir.code.NumericType):44:49 -> <init>
     1:15:int getAsmOpcode():103:117 -> F
     16:16:int getAsmOpcode():0:0 -> F
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":151,"2":152,"3":153}}
-    151:151:int getAsmOpcode():117:117 -> F
-    152:152:int getAsmOpcode():117:117 -> F
-    153:153:int getAsmOpcode():117:117 -> F
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":140,"2":141,"3":142}}
+    140:140:int getAsmOpcode():117:117 -> F
+    141:141:int getAsmOpcode():117:117 -> F
+    142:142:int getAsmOpcode():117:117 -> F
     133:133:int getAsmOpcode():117:117 -> F
     134:134:int getAsmOpcode():115:115 -> F
     135:135:int getAsmOpcode():113:113 -> F
@@ -7270,12 +7277,12 @@
     197:197:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):152:152 -> a
     198:198:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):149:149 -> a
     199:199:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:146 -> a
-    220:220:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):182:182 -> a
-    221:221:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):157:157 -> a
-    221:221:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):182 -> a
-    222:231:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):184:193 -> a
+    220:220: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:183 -> a
+    221:221:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):156:156 -> a
+    221:221: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
+    222:231: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 -> s
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.N7:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.M7:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> h
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Ushr -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> e
@@ -7286,7 +7293,7 @@
     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.P7:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.O7:
     com.android.tools.r8.ir.code.Monitor$Type type -> b
     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 -> F
@@ -7303,48 +7310,48 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:10:com.android.tools.r8.ir.code.Monitor com.android.tools.r8.ir.conversion.IRBuilder.addMonitor(com.android.tools.r8.ir.code.Monitor$Type,int):1295:1296 -> 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):82 -> a
-    11:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):99:99 -> a
-    12:12:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:127 -> a
-    12:12:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):99 -> a
+    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):100:100 -> a
+    12:12: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:125 -> 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):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):128:128 -> a
-    13:13:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):99 -> a
+    13:13:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):126:126 -> a
+    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):100 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():275:275 -> a
     14:14:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):88 -> a
     boolean canThrow() -> q
     1:1:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():66:66 -> s
     1:1:int getCompareToId():43 -> s
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.Q7:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.P7:
     com.android.tools.r8.graph.DexType type -> b
     int dimensions -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):41:43 -> <init>
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):40:42 -> <init>
     boolean isTypeInstruction() -> E
-    1:1:int getDimensions():67:67 -> F
-    1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):38:38 -> a
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfMultiANewArray.getType():58:58 -> 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):91 -> a
-    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):91:91 -> a
+    1:1:int getDimensions():66:66 -> F
+    1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):37:37 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfMultiANewArray.getType():57:57 -> 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):90 -> a
+    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):90:90 -> a
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    4:4: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):91 -> a
-    5:5: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):92:92 -> a
-    6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):78:78 -> a
-    7:7:void print(com.android.tools.r8.cf.CfPrinter):97:97 -> a
-    8:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):103:103 -> a
-    9:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):113:115 -> a
+    4:4: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 -> a
+    5:5: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):91:91 -> a
+    6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):77:77 -> a
+    7:7:void print(com.android.tools.r8.cf.CfPrinter):96:96 -> a
+    8:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):102:102 -> a
+    9:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112:114 -> a
     12:14:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):193:195 -> a
-    12:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):115 -> a
-    15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):116:116 -> a
-    16:16: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):122:122 -> a
-    17:20:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):133:136 -> a
-    21:21:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    21:21:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):136 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():58:58 -> getType
+    12:14:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):114 -> a
+    15:15:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):115:115 -> a
+    16:16: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):121:121 -> a
+    17:20: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):133:136 -> a
+    21:21:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    21:21: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):136 -> a
+    1:1:com.android.tools.r8.graph.DexType getType():57:57 -> getType
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.S7:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.R7:
     com.android.tools.r8.ir.code.NumericType type -> b
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):34:35 -> <init>
     1:14:int getAsmOpcode():72:85 -> F
@@ -7359,105 +7366,105 @@
     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):63:63 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> 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):106:107 -> a
-    6:6:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):124:124 -> a
-    7:7:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):157:157 -> a
-    7:7:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):124 -> a
-    8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):125:125 -> 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):125:125 -> a
+    7:7:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):156:156 -> 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):125 -> 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):126:126 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():339:339 -> a
     9:9: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):113 -> a
     1:1:int getCompareToId():44:44 -> s
-com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.R7:
+com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.Q7:
     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.T7:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.S7:
     com.android.tools.r8.graph.DexType type -> b
-    1:2:void <init>(com.android.tools.r8.graph.DexType):35:36 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexType):34:35 -> <init>
     boolean isTypeInstruction() -> E
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):67:67 -> 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):66:66 -> a
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> 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):67 -> a
-    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):80:80 -> 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):66 -> a
+    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):79:79 -> a
     4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    4:4: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):80 -> a
-    5:5: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):81:81 -> a
-    6:6:void print(com.android.tools.r8.cf.CfPrinter):86:86 -> a
-    7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):92:92 -> a
-    8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):102:102 -> a
-    9:9: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):108:108 -> a
-    10:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):119:119 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():51:51 -> getType
+    4:4: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):79 -> a
+    5:5: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):80:80 -> a
+    6:6:void print(com.android.tools.r8.cf.CfPrinter):85:85 -> a
+    7:7:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):91:91 -> a
+    8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):101:101 -> a
+    9:9: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):107:107 -> 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):119:119 -> a
+    1:1:com.android.tools.r8.graph.DexType getType():50:50 -> getType
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.U7:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.T7:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType):37:39 -> <init>
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType):36:38 -> <init>
+    boolean isTypeInstruction() -> E
+    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):69:69 -> a
+    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> 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):69 -> a
+    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):121:121 -> a
+    4:22:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():73:91 -> a
+    4:22: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):122 -> a
+    23:23: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41,"2":42,"3":43}}
+    41:41:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():91:91 -> a
+    41:41: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):122 -> a
+    42:42:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():91:91 -> a
+    42:42: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):122 -> a
+    43:43:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():91:91 -> a
+    43:43: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):122 -> a
+    24:24:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():91:91 -> a
+    24:24: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):122 -> a
+    25:25: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):122:122 -> a
+    26:34:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):97:105 -> a
+    26:34: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):125 -> a
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    35:35:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):105 -> a
+    35:35: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):125 -> a
+    36:36:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):107:107 -> a
+    36:36: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):125 -> a
+    37:39:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):106:108 -> a
+    37:39: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):125 -> a
+    40:40: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):124:124 -> a
+    44:44:void print(com.android.tools.r8.cf.CfPrinter):131:131 -> a
+    45:46:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):137:138 -> a
+    47:49:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):149:151 -> a
+    50:50: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):157:157 -> a
+    51:52: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):169:170 -> a
+    53:53:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    53:53: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):170 -> a
+    1:1:com.android.tools.r8.graph.DexType getType():53:53 -> getType
+    com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
+    boolean canThrow() -> q
+    1:1:int getCompareToId():63:63 -> s
+com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.U7:
+    com.android.tools.r8.graph.DexType type -> b
+    int ordinal -> c
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):37:39 -> <init>
     boolean isTypeInstruction() -> E
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):70:70 -> a
     2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> 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):70 -> a
-    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):122:122 -> a
-    4:22:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():74:92 -> a
-    4:22: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):123 -> a
-    23:23: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41,"2":42,"3":43}}
-    41:41:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():92:92 -> a
-    41:41: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):123 -> a
-    42:42:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():92:92 -> a
-    42:42: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):123 -> a
-    43:43:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():92:92 -> a
-    43:43: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):123 -> a
-    24:24:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():92:92 -> a
-    24:24: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):123 -> a
-    25:25: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):123:123 -> a
-    26:34:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):98:106 -> a
-    26:34: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):126 -> a
-    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    35:35:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):106 -> a
-    35:35: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):126 -> a
-    36:36:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):108:108 -> a
-    36:36: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):126 -> a
-    37:39:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):107:109 -> a
-    37:39: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):126 -> a
-    40:40: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):125:125 -> a
-    44:44:void print(com.android.tools.r8.cf.CfPrinter):132:132 -> a
-    45:46:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):138:139 -> a
-    47:49:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):150:152 -> a
-    50:50: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):158:158 -> a
-    51:52:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):169:170 -> a
-    53:53:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    53:53:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):170 -> a
+    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):117:117 -> a
+    6:6:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):94 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    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: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:122 -> a
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):303:303 -> a
+    9:9: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 -> a
     1:1:com.android.tools.r8.graph.DexType getType():54:54 -> getType
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
     boolean canThrow() -> q
-    1:1:int getCompareToId():64:64 -> s
-com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.V7:
-    com.android.tools.r8.graph.DexType type -> b
-    int ordinal -> c
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):38:40 -> <init>
-    boolean isTypeInstruction() -> E
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):71:71 -> a
-    2:2:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> 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):71 -> a
-    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):84:84 -> a
-    4:4:void print(com.android.tools.r8.cf.CfPrinter):89:89 -> a
-    5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):95:95 -> a
-    6:6:void com.android.tools.r8.graph.UseRegistry.registerNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType):117:117 -> a
-    6:6:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):95 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    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):105:105 -> a
-    8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):122:122 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forNewUnboxedEnumInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):303:303 -> a
-    9:9: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):111 -> a
-    1:1:com.android.tools.r8.graph.DexType getType():55:55 -> getType
-    com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> p
-    boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.V7:
     1:1:void <init>():26:26 -> <init>
-    void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory) -> a
+    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
     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):49:49 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):54:54 -> a
@@ -7465,7 +7472,7 @@
     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() -> r
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.Y7:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.X7:
     com.android.tools.r8.ir.code.NumericType to -> c
     com.android.tools.r8.ir.code.NumericType from -> b
     boolean $assertionsDisabled -> d
@@ -7473,37 +7480,37 @@
     1:7:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType):35:41 -> <init>
     1:53:int getAsmOpcode():82:134 -> F
     54:54:int getAsmOpcode():0:0 -> F
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":741,"2":742,"3":743}}
-    741:741:int getAsmOpcode():134:134 -> F
-    742:742:int getAsmOpcode():134:134 -> F
-    743:743:int getAsmOpcode():134:134 -> F
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":717,"2":718,"3":719}}
+    717:717:int getAsmOpcode():134:134 -> F
+    718:718:int getAsmOpcode():134:134 -> F
+    719:719:int getAsmOpcode():134:134 -> F
     188:188:int getAsmOpcode():134:134 -> F
     189:203:int getAsmOpcode():84:98 -> F
     204:204:int getAsmOpcode():0:0 -> F
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":744,"2":745,"3":746}}
-    744:744:int getAsmOpcode():98:98 -> F
-    745:745:int getAsmOpcode():98:98 -> F
-    746:746:int getAsmOpcode():98:98 -> F
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":717,"2":718,"3":719}}
+    717:717:int getAsmOpcode():98:98 -> F
+    718:718:int getAsmOpcode():98:98 -> F
+    719:719:int getAsmOpcode():98:98 -> F
     302:335:int getAsmOpcode():98:131 -> F
     336:336:int getAsmOpcode():0:0 -> F
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":779,"2":780,"3":781}}
-    779:779:int getAsmOpcode():131:131 -> F
-    780:780:int getAsmOpcode():131:131 -> F
-    781:781:int getAsmOpcode():131:131 -> F
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":717,"2":718,"3":719}}
+    717:717:int getAsmOpcode():131:131 -> F
+    718:718:int getAsmOpcode():131:131 -> F
+    719:719:int getAsmOpcode():131:131 -> F
     467:467:int getAsmOpcode():131:131 -> F
     468:476:int getAsmOpcode():112:120 -> F
     477:477:int getAsmOpcode():0:0 -> F
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":782,"2":783,"3":784}}
-    782:782:int getAsmOpcode():120:120 -> F
-    783:783:int getAsmOpcode():120:120 -> F
-    784:784:int getAsmOpcode():120:120 -> F
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":717,"2":718,"3":719}}
+    717:717:int getAsmOpcode():120:120 -> F
+    718:718:int getAsmOpcode():120:120 -> F
+    719:719:int getAsmOpcode():120:120 -> F
     597:597:int getAsmOpcode():120:120 -> F
     598:606:int getAsmOpcode():101:109 -> F
     607:607:int getAsmOpcode():0:0 -> F
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":785,"2":786,"3":787}}
-    785:785:int getAsmOpcode():109:109 -> F
-    786:786:int getAsmOpcode():109:109 -> F
-    787:787:int getAsmOpcode():109:109 -> F
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":717,"2":718,"3":719}}
+    717:717:int getAsmOpcode():109:109 -> F
+    718:718:int getAsmOpcode():109:109 -> F
+    719:719:int getAsmOpcode():109:109 -> F
     716:716:int getAsmOpcode():109:109 -> F
     1:1:com.android.tools.r8.ir.code.NumericType getFromType():56:56 -> G
     1:1:com.android.tools.r8.ir.code.NumericType getToType():60:60 -> H
@@ -7511,26 +7518,26 @@
     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):73:73 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):78:78 -> 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):177:178 -> a
-    6:6:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):195:195 -> a
-    7:7:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):157:157 -> a
-    7:7:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):196 -> a
-    8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):196:196 -> a
-    9:9:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):157:157 -> a
-    9:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    10:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):197:197 -> 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):196:196 -> a
+    7:7:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):156:156 -> 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):197 -> 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):197:197 -> a
+    9:9:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):156:156 -> 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):198 -> 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):198:198 -> a
     11:11:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():339:339 -> a
     11:11: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):184 -> a
     1:1:int getCompareToId():46:46 -> s
-com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.X7:
+com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.W7:
     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.c8:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.b8:
     com.android.tools.r8.cf.code.CfLabel label -> b
     com.android.tools.r8.ir.code.Position position -> c
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):31:33 -> <init>
     1:1:com.android.tools.r8.cf.code.CfLabel getLabel():75:75 -> F
     1:1:com.android.tools.r8.ir.code.Position getPosition():71:71 -> G
-    void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory) -> a
+    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):44:44 -> a
     2:2:int lambda$internalAcceptCompareTo$0(com.android.tools.r8.cf.code.CfPosition):48:48 -> a
     3:4:void lambda$internalAcceptCompareTo$2(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):48:49 -> a
@@ -7545,7 +7552,7 @@
     com.android.tools.r8.cf.code.CfPosition asPosition() -> m
     boolean emitsIR() -> r
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.m8:
+com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.l8:
     com.android.tools.r8.graph.DexField[] fields -> b
     1:2:void <init>(com.android.tools.r8.graph.DexField[]):35:36 -> <init>
     1:1:com.android.tools.r8.graph.DexField[] getFields():67:67 -> F
@@ -7579,14 +7586,14 @@
     30:30:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
     31:36:void com.android.tools.r8.ir.conversion.IRBuilder.addRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList,int):1493:1498 -> a
     31:36:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94 -> a
-    37:40:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):112:115 -> a
-    41:41:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):169:169 -> a
-    41:41:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):115 -> a
+    37:40: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):113:116 -> a
+    41:41:com.android.tools.r8.cf.code.CfFrameVerificationHelper com.android.tools.r8.cf.code.CfFrameVerificationHelper.push(com.android.tools.r8.graph.DexType):167:167 -> a
+    41:41: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 -> a
     42:42:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forRecordFieldValues():291:291 -> a
     42:42: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):103 -> a
     com.android.tools.r8.cf.code.CfRecordFieldValues asRecordFieldValues() -> n
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.p8:
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():29:29 -> <clinit>
@@ -7609,7 +7616,7 @@
     17:17: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):84:84 -> a
     21:21:void print(com.android.tools.r8.cf.CfPrinter):89:89 -> a
     22:23:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):99:100 -> a
-    24:26:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):115:117 -> a
+    24:26: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
     27:27:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():315:315 -> a
     27:27: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):106 -> a
     1:13:int com.android.tools.r8.cf.code.CfReturn.getOpcode():53:65 -> s
@@ -7624,10 +7631,10 @@
     18:18:int getCompareToId():43 -> s
     15:15:int com.android.tools.r8.cf.code.CfReturn.getOpcode():65:65 -> s
     15:15:int getCompareToId():43 -> s
-com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.p8:
+com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.o8:
     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.r8:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.q8:
     1:1:void <init>():26:26 -> <init>
     boolean isJump() -> C
     boolean isReturn() -> D
@@ -7635,15 +7642,15 @@
     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):54:54 -> a
     3:3:void print(com.android.tools.r8.cf.CfPrinter):59:59 -> 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):74:74 -> a
-    5:5:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):89:89 -> a
+    5:5: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
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():315:315 -> 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):80 -> a
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.s8:
+com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.r8:
     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.A8:
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.z8:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -7797,128 +7804,128 @@
     296:296:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1301:1301 -> a
     296:296: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 -> a
     297:297: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
-    298:449:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):357:508 -> a
-    450:450:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    450:450:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):502 -> a
-    451:451:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:127 -> a
-    451:451:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):502 -> a
+    298:449: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
+    450:450:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    450:450: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):503 -> a
+    451:451: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:125 -> a
+    451:451: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):503 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    452:452:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):128:128 -> a
-    452:452:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):502 -> a
-    453:453:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    453:453:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):503 -> a
-    454:455:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    454:455:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):503 -> a
-    456:456:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):504:504 -> a
-    457:461:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):463:467 -> a
-    462:462:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    462:462:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):469 -> a
-    463:463:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):469:469 -> a
-    464:464:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    464:464:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):470 -> a
-    465:465:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):470:470 -> a
-    466:466:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    466:466:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):471 -> a
-    467:467:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):471:471 -> a
-    468:468:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    468:468:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):472 -> a
-    469:470:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    469:470:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):472 -> a
-    471:476:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):474:479 -> a
-    477:477:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    477:477:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):482 -> a
-    478:478:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):482:482 -> a
-    479:479:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    479:479:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):483 -> a
-    480:483:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):483:486 -> a
-    484:484:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    484:484:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):488 -> a
-    485:485:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):488:488 -> a
-    486:486:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    486:486:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):489 -> a
-    487:488:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    487:488:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):489 -> a
-    489:493:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):490:494 -> a
-    494:494:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):436:436 -> a
-    495:495:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    495:495:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):437 -> a
-    496:497:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    496:497:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):437 -> a
-    498:498:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):438:438 -> a
-    499:499:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    499:499:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):439 -> a
-    500:500:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):439:439 -> a
-    501:501:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    501:501:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):440 -> a
-    502:503:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    502:503:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):440 -> a
-    504:509:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):441:446 -> a
-    510:511:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):418:419 -> a
-    512:512:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    512:512:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):420 -> a
-    513:513:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):420:420 -> a
-    514:514:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    514:514:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):421 -> a
-    515:516:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    515:516:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):421 -> a
-    517:521:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):422:426 -> a
-    522:522:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    522:522:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):399 -> a
-    523:523:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:127 -> a
-    523:523:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):399 -> a
+    452:452:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):126:126 -> a
+    452:452: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):503 -> a
+    453:453:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    453:453: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):504 -> a
+    454:455: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
+    454:455: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):504 -> a
+    456:456: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):505:505 -> a
+    457:461: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):464:468 -> a
+    462:462:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    462:462: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):470 -> a
+    463:463: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):470:470 -> a
+    464:464:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    464:464: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):471 -> a
+    465:465: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):471:471 -> a
+    466:466:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    466:466: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):472 -> a
+    467:467: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):472:472 -> a
+    468:468:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    468:468: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):473 -> a
+    469:470: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
+    469:470: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):473 -> a
+    471:476: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):475:480 -> a
+    477:477:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    477:477: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):483 -> a
+    478:478: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):483:483 -> a
+    479:479:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    479:479: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):484 -> a
+    480:483: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):484:487 -> a
+    484:484:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    484:484: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):489 -> a
+    485:485: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):489:489 -> a
+    486:486:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    486:486: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):490 -> a
+    487:488: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
+    487:488: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):490 -> a
+    489:493: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):491:495 -> a
+    494:494: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):437:437 -> a
+    495:495:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    495:495: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):438 -> a
+    496:497: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
+    496:497: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):438 -> a
+    498:498: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):439:439 -> a
+    499:499:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    499:499: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):440 -> a
+    500:500: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):440:440 -> a
+    501:501:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    501:501: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):441 -> a
+    502:503: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
+    502:503: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):441 -> a
+    504:509: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):442:447 -> a
+    510:511: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):419:420 -> a
+    512:512:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    512:512: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):421 -> a
+    513:513: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):421:421 -> a
+    514:514:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    514:514: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):422 -> a
+    515:516: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
+    515:516: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):422 -> a
+    517:521: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):423:427 -> a
+    522:522:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    522:522: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):400 -> a
+    523:523: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:125 -> a
+    523:523: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):400 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    524:524:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):128:128 -> a
-    524:524:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):399 -> a
-    525:526:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):400:401 -> a
-    527:527:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    527:527:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):402 -> a
-    528:528:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):402:402 -> a
-    529:529:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    529:529:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):403 -> a
-    530:531:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    530:531:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):403 -> a
-    532:536:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):404:408 -> a
-    537:537:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    537:537:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    538:538:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:127 -> a
-    538:538:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):387 -> a
+    524:524:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):126:126 -> a
+    524:524: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):400 -> a
+    525:526: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):401:402 -> a
+    527:527:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    527:527: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):403 -> a
+    528:528: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):403:403 -> a
+    529:529:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    529: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):404 -> a
+    530:531: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
+    530:531: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):404 -> a
+    532:536: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):405:409 -> a
+    537:537:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    537:537: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):388 -> a
+    538:538: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:125 -> a
+    538:538: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):388 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    539:539:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):128:128 -> a
-    539:539:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    540:540:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    540:540:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):388 -> a
-    541:542:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    541:542:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):388 -> a
-    543:543:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):389:389 -> a
-    544:544:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    544:544:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):379 -> a
-    545:545:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:127 -> a
-    545:545:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):379 -> a
+    539:539:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):126:126 -> a
+    539:539: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):388 -> a
+    540:540:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    540:540: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):389 -> a
+    541:542: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
+    541:542: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):389 -> a
+    543:543: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):390:390 -> a
+    544:544:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    544:544: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):380 -> a
+    545:545: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:125 -> a
+    545:545: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):380 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    546:546:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):128:128 -> a
-    546:546:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):379 -> a
-    547:547:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):380:380 -> a
-    548:549:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):369:370 -> a
-    550:550:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    550:550:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):371 -> a
-    551:551:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):371:371 -> a
-    552:552:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    552:552:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):372 -> a
-    553:554:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:128 -> a
-    553:554:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):372 -> a
-    555:555:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():60:60 -> a
-    555:555:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):361 -> a
-    556:556:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):127:127 -> a
-    556:556:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):361 -> a
+    546:546:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):126:126 -> a
+    546:546: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):380 -> a
+    547:547: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):381:381 -> a
+    548:549: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):370:371 -> a
+    550:550:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    550:550: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):372 -> a
+    551:551: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):372:372 -> a
+    552:552:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    552:552: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):373 -> a
+    553:554: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
+    553:554: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):373 -> a
+    555:555:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.oneWord():59:59 -> a
+    555:555: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
+    556:556: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:125 -> a
+    556:556: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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    557:557:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):128:128 -> a
-    557:557:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):361 -> a
+    557:557:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):126:126 -> a
+    557:557: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
     boolean emitsIR() -> r
     1:1:int getCompareToId():88:88 -> s
-com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.z8:
+com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.y8:
     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.A8$a:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.z8$a:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> j
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X1 -> i
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> l
@@ -7935,15 +7942,15 @@
     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.CfStaticFieldRead -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.cf.code.CfStaticFieldRead -> com.android.tools.r8.internal.K8:
     1:1:void <init>(com.android.tools.r8.graph.DexField):17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):21:21 -> <init>
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):27:27 -> a
-com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.M8:
+com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.L8:
     1:1:void <init>(com.android.tools.r8.graph.DexField):16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):20:20 -> <init>
     1:1:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):26:26 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.O8:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.N8:
     com.android.tools.r8.ir.code.ValueType type -> c
     int var -> b
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):37:39 -> <init>
@@ -7967,21 +7974,21 @@
     22:23: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
     24:24:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1301:1301 -> a
     24:24: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
-    25:60:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):131:166 -> a
-    61:61:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":278,"2":279,"3":280}}
-    278:278:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):166:166 -> a
-    279:279:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):166:166 -> a
-    280:280:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):166:166 -> a
-    227:227:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):166:166 -> a
-    228:231:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):160:163 -> a
-    232:235:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):154:157 -> a
-    236:238:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):149:151 -> a
-    239:241:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):144:146 -> a
-    242:246:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):134:134 -> a
-    253:253:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):141:141 -> a
-    281:281:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():327:327 -> a
-    281:281: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 -> a
+    25:60: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:167 -> a
+    61:61: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":279,"2":280,"3":281}}
+    279:279: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):167:167 -> a
+    280:280: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):167:167 -> a
+    281:281: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):167:167 -> a
+    228:228: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):167:167 -> a
+    229:232: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):161:164 -> a
+    233:236: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):155:158 -> a
+    237:239: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):150:152 -> a
+    240:242: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):145:147 -> a
+    243:247: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):135:135 -> a
+    254:254: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):142:142 -> a
+    282:282:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():327:327 -> a
+    282:282: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 -> a
     com.android.tools.r8.cf.code.CfStore asStore() -> o
     boolean emitsIR() -> r
     1:13:int com.android.tools.r8.cf.code.CfStore.getStoreType():54:66 -> s
@@ -7996,10 +8003,10 @@
     18:18:int getCompareToId():44 -> s
     15:15:int com.android.tools.r8.cf.code.CfStore.getStoreType():66:66 -> s
     15:15:int getCompareToId():44 -> s
-com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.N8:
+com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.M8:
     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.Q8:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.P8:
     java.util.List targets -> e
     int[] keys -> d
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> b
@@ -8023,33 +8030,33 @@
     21:21: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):113:113 -> a
     22:22:void print(com.android.tools.r8.cf.CfPrinter):125:125 -> a
     23:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:135 -> a
-    29:34:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):152:157 -> a
+    29: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):153:158 -> a
     35:35:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
     35:35: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):141 -> a
     1:1:int getCompareToId():50:50 -> s
-com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.P8:
+com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.O8:
     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.Q8$a:
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.P8$a:
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> c
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> d
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> b
     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.R8:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.Q8:
     1:1:void <init>():27:27 -> <init>
     boolean isJump() -> C
     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
     3:3:void print(com.android.tools.r8.cf.CfPrinter):70:70 -> 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):80:81 -> a
-    6:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory):98:100 -> a
+    6: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):99:101 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
     9:9: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):87 -> a
     boolean canThrow() -> q
     int getCompareToId() -> s
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.S8:
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.R8:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -8074,7 +8081,7 @@
     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.T8:
+com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.S8:
 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>
@@ -8354,12 +8361,12 @@
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
     int getSize() -> x
-com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.m6:
-com.android.tools.r8.code.CfOrDexInstanceFieldRead -> com.android.tools.r8.internal.Z7:
-com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.a8:
+com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.code.CfOrDexInstanceFieldRead -> com.android.tools.r8.internal.Y7:
+com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.Z7:
     com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> b
     com.android.tools.r8.code.Instruction asDexInstruction() -> c
-com.android.tools.r8.code.CfOrDexStaticFieldRead -> com.android.tools.r8.internal.b8:
+com.android.tools.r8.code.CfOrDexStaticFieldRead -> com.android.tools.r8.internal.a8:
 com.android.tools.r8.code.CheckCast -> com.android.tools.r8.code.K:
     boolean ignoreCompatRules -> i
     1:2:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):27:28 -> <init>
@@ -12832,10 +12839,10 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
     2:2:java.lang.Object or(java.lang.Object):48 -> a
     1:1:java.lang.String toString():91:91 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.d9:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.c9:
     1:1:void <init>():359:359 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.a9:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.Z8:
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> c
     1:1:void <clinit>():1011:1011 -> <clinit>
     1:1:void <init>():1014:1014 -> <init>
@@ -12843,7 +12850,7 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():127:127 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Any.negate():1101 -> negate
     1:1:java.util.function.Predicate negate():1009 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.b9:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.a9:
     java.lang.String description -> b
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():939:939 -> <init>
     1:1:void <init>(java.lang.String):957 -> <init>
@@ -12856,7 +12863,7 @@
     2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.apply(java.lang.Object):0 -> apply
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.lang.String toString():963:963 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.c9:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.b9:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> c
     1:1:void <clinit>():1108:1108 -> <clinit>
     1:1:void <init>():1111:1111 -> <init>
@@ -12864,12 +12871,12 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():118:118 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$None.negate():1204 -> negate
     1:1:java.util.function.Predicate negate():1106 -> negate
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.k9:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.j9:
     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.ic:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.hc:
     1:1:void <init>():25:25 -> <init>
-com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.bj:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Wi:
     1:1:void <init>():39:39 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -12877,7 +12884,7 @@
     2:2:int hash(java.lang.Object):112:112 -> 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):76:76 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.aj:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Vi:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.lang.Object reference -> c
     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):185:185 -> <init>
@@ -12886,27 +12893,27 @@
     1:11:boolean equals(java.lang.Object):209:219 -> equals
     1:1:int hashCode():228:228 -> hashCode
     1:1:java.lang.String toString():237:237 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.Cl:
-com.android.tools.r8.com.google.common.base.Java8Usage -> com.android.tools.r8.internal.pv:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.xl:
+com.android.tools.r8.com.google.common.base.Java8Usage -> com.android.tools.r8.internal.iv:
     void lambda$performCheck$0() -> a
     1:2:java.lang.String performCheck():39:40 -> b
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.xv:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.qv:
     java.util.regex.Pattern pattern -> b
     1:2:void <init>(java.util.regex.Pattern):27:28 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):33:33 -> a
     1:1:java.lang.String toString():48:48 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.wv:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.pv:
     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):54 -> <init>
     2:2:void <init>(java.util.regex.Matcher):55:55 -> <init>
-com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.oK:
+com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.eK:
     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.EK:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.uK:
     1:1:void <init>():161:161 -> <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.NL:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.DL:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> a
     1:1:void <clinit>():33:33 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.base.PatternCompiler com.android.tools.r8.com.google.common.base.Platform.loadPatternCompiler():91:91 -> <clinit>
@@ -12915,10 +12922,10 @@
     1:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):82:83 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):101:101 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):83 -> a
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.LL:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.BL:
     1:1:void <init>():98:98 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):98:98 -> <init>
-com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.aM:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.QL:
     int $r8$clinit -> a
     1:9:void <clinit>():1439:1447 -> <clinit>
     1:1:void checkArgument(boolean):130:130 -> a
@@ -12954,9 +12961,9 @@
     2:2:int checkPositionIndex(int,int):1374:1374 -> b
     3:3:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1392:1392 -> b
     3:3:int checkPositionIndex(int,int):1374 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.bM:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.RL:
     1:1:boolean test(java.lang.Object):79:79 -> test
-com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.lM:
+com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.bM:
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysFalse():57:57 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate not(com.android.tools.r8.com.google.common.base.Predicate):83:83 -> 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):147:147 -> a
@@ -12966,14 +12973,14 @@
     5:5: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):147 -> a
     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):147:147 -> a
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysTrue():51:51 -> b
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.eM:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.UL:
     com.android.tools.r8.com.google.common.base.Predicate predicate -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):310:311 -> <init>
     1:1:boolean apply(java.lang.Object):316:316 -> apply
     1:3:boolean equals(java.lang.Object):326:328 -> equals
     1:1:int hashCode():321:321 -> hashCode
     1:1:java.lang.String toString():335:335 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.jM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.ZL:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate IS_NULL -> d
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate NOT_NULL -> e
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_TRUE -> b
@@ -12981,19 +12988,19 @@
     1:37:void <clinit>():252:288 -> <clinit>
     1:1:void <init>(java.lang.String,int):250:250 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):250:250 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.fM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.VL:
     1:1:void <init>(java.lang.String,int):252:252 -> <init>
     1:1:java.lang.String toString():260:260 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.gM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.WL:
     1:1:void <init>(java.lang.String,int):264:264 -> <init>
     1:1:java.lang.String toString():272:272 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.hM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.XL:
     1:1:void <init>(java.lang.String,int):276:276 -> <init>
     1:1:java.lang.String toString():284:284 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.iM:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.YL:
     1:1:void <init>(java.lang.String,int):288:288 -> <init>
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.kM:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.aM:
     java.util.List components -> b
     1:1:void <init>(java.util.List,com.android.tools.r8.com.google.common.base.Predicates$1):384:384 -> <init>
     2:3:void <init>(java.util.List):387:388 -> <init>
@@ -13004,7 +13011,7 @@
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.toStringHelper(java.lang.String,java.lang.Iterable):426:435 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.access$800(java.lang.String,java.lang.Iterable):42 -> toString
     2:11:java.lang.String toString():419 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.wV:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.mV:
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):260:260 -> 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):222:222 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):260 -> a
@@ -13017,7 +13024,7 @@
     5:5:void com.android.tools.r8.com.google.common.base.Splitter.<init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):109 -> a
     5:5: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):226 -> a
     5:5:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):260 -> a
-com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.cX:
+com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.SW:
     1:5:java.lang.String repeat(java.lang.String,int):144:148 -> a
     6:6:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> a
     6:6:java.lang.String repeat(java.lang.String,int):147 -> a
@@ -13027,24 +13034,24 @@
     25:36:java.lang.String com.android.tools.r8.com.google.common.base.Strings.lenientToString(java.lang.Object):302:313 -> a
     25:36:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):267 -> a
     37:67:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):267:297 -> a
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.tX:
-com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.xX:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.jX:
+com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.nX:
     1:7:com.android.tools.r8.com.google.common.base.Supplier memoize(com.android.tools.r8.com.google.common.base.Supplier):102:108 -> a
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.vX:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.lX:
     java.lang.Object value -> d
     com.android.tools.r8.com.google.common.base.Supplier delegate -> b
     boolean initialized -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):119:120 -> <init>
     1:11:java.lang.Object get():126:136 -> get
     1:1:java.lang.String toString():142:142 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.wX:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.mX:
     java.lang.Object value -> d
     com.android.tools.r8.com.google.common.base.Supplier delegate -> b
     boolean initialized -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):157:158 -> <init>
     1:13:java.lang.Object get():164:176 -> get
     1:3:java.lang.String toString():181:183 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.cY:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.SX:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:3:java.lang.Object com.android.tools.r8.com.google.common.base.Throwables.getJLA():480:482 -> <clinit>
@@ -13512,15 +13519,15 @@
     4:4:void forEachEntry(java.util.function.ObjIntConsumer):158 -> a
     5:5:void forEachEntry(java.util.function.ObjIntConsumer):159:159 -> a
     6:6:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,java.lang.Object,com.android.tools.r8.com.google.common.collect.Count):159:159 -> a
-    7:21:int add(java.lang.Object,int):252:266 -> a
-    22:22:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):205:205 -> a
-    22:22:int add(java.lang.Object,int):263 -> a
-    23:23:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> a
-    23:23:int add(java.lang.Object,int):254 -> a
+    7:26:int remove(java.lang.Object,int):274:293 -> a
+    27:27:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> a
+    27:27:int remove(java.lang.Object,int):276 -> a
     1:1:java.util.Map access$100(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset):47:47 -> b
-    2:21:int remove(java.lang.Object,int):274:293 -> b
-    22:22:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> b
-    22:22:int remove(java.lang.Object,int):276 -> b
+    2:16:int add(java.lang.Object,int):252:266 -> b
+    17:17:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):205:205 -> b
+    17:17:int add(java.lang.Object,int):263 -> b
+    18:18:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> b
+    18:18:int add(java.lang.Object,int):254 -> b
     1:1:int distinctElements():173:173 -> c
     1:5:void clear():164:168 -> clear
     1:2:java.util.Iterator elementIterator():85:86 -> d
@@ -13647,15 +13654,15 @@
     java.util.Set entrySet -> c
     java.util.Set elementSet -> b
     1:1:void <init>():45:45 -> <init>
-    1:1:int add(java.lang.Object,int):69:69 -> a
-    2:2:java.util.Set createElementSet():143:143 -> a
-    3:7:boolean com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int,int):940:944 -> a
-    3:7:boolean setCount(java.lang.Object,int,int):93 -> a
+    int remove(java.lang.Object,int) -> a
+    1:1:java.util.Set createElementSet():143:143 -> a
     1:1:boolean add(java.lang.Object):62:62 -> add
     1:1:boolean addAll(java.util.Collection):107:107 -> addAll
-    int remove(java.lang.Object,int) -> b
-    1:1:java.util.Set createEntrySet():191:191 -> b
+    1:1:int add(java.lang.Object,int):69:69 -> b
+    2:2:java.util.Set createEntrySet():191:191 -> b
     int distinctElements() -> c
+    1:5:boolean com.android.tools.r8.com.google.common.collect.Multisets.setCountImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object,int,int):940:944 -> c
+    1:5:boolean setCount(java.lang.Object,int,int):93 -> c
     1:1:boolean contains(java.lang.Object):55:55 -> contains
     java.util.Iterator elementIterator() -> d
     java.util.Iterator entryIterator() -> e
@@ -13742,7 +13749,7 @@
     1:9:boolean com.android.tools.r8.com.google.common.collect.Multisets$EntrySet.remove(java.lang.Object):0 -> remove
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:int size():186:186 -> size
-com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.l3:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimap -> com.android.tools.r8.internal.k3:
     int expectedValuesPerKey -> h
     1:1:void <init>():108:108 -> <init>
     2:4:void <init>(int,int):112:114 -> <init>
@@ -13758,7 +13765,7 @@
     2:3:boolean remove(java.lang.Object,java.lang.Object):61 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():263:263 -> toString
     1:1:java.lang.String toString():61 -> toString
-com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies -> com.android.tools.r8.internal.m3:
+com.android.tools.r8.com.google.common.collect.ArrayListMultimapGwtSerializationDependencies -> com.android.tools.r8.internal.l3:
     1:1:void com.android.tools.r8.com.google.common.collect.AbstractListMultimap.<init>(java.util.Map):44:44 -> <init>
     1:1:void <init>(java.util.Map):36 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):76:76 -> a
@@ -13776,12 +13783,12 @@
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):35:35 -> get
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.s4:
+com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.r4:
     1:1:void <init>():25:25 -> <init>
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.K4:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.J4:
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
     com.android.tools.r8.com.google.common.collect.BiMap inverse() -> g
-com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.Y5:
+com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.X5:
     com.android.tools.r8.com.google.common.collect.Ordering ordering -> c
     com.android.tools.r8.com.google.common.base.Function function -> 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>
@@ -13791,11 +13798,11 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):77:77 -> 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.Mb:
+com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.Lb:
     1:1:void checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
     2:2:void checkEntryNotNull(java.lang.Object,java.lang.Object):30:30 -> a
     3:3:int checkNonnegative(int,java.lang.String):39:39 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.Tb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.Sb:
     1:1:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction,java.util.Comparator):98:98 -> a
     1:1:java.util.Spliterator indexed(int,int,java.util.function.IntFunction):42 -> a
     2:2:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):108:108 -> a
@@ -13810,7 +13817,7 @@
     11:11:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     11:11:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):213 -> a
     12:12:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):214:214 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.Nb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.Mb:
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
     1:1:void <init>(java.util.Spliterator,java.util.function.Function):110:110 -> <init>
@@ -13821,7 +13828,7 @@
     1:1:void forEachRemaining(java.util.function.Consumer):120:120 -> forEachRemaining
     1:1:boolean tryAdvance(java.util.function.Consumer):114:114 -> tryAdvance
     1:2:java.util.Spliterator trySplit():125:126 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.Ob:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.Nb:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -13839,7 +13846,7 @@
     4:4:java.util.Spliterator trySplit():172 -> trySplit
     5:5:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):194:194 -> trySplit
     5:5:java.util.Spliterator trySplit():172 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.Pb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.Ob:
     java.util.function.IntFunction val$function -> b
     java.util.Spliterator$OfInt delegate -> a
     java.util.Comparator val$comparator -> d
@@ -13853,7 +13860,7 @@
     1:4:java.util.Comparator getComparator():91:94 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):62:62 -> tryAdvance
     1:2:java.util.Spliterator trySplit():72:73 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.Rb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.Qb:
     long estimatedSize -> f
     java.util.function.Function function -> c
     java.util.Spliterator from -> b
@@ -13868,43 +13875,43 @@
     1:12:void forEachRemaining(java.util.function.Consumer):353:364 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):337:345 -> tryAdvance
     1:17:java.util.Spliterator trySplit():369:385 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.Qb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.Pb:
     java.util.Spliterator newFlatMapSpliterator(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,int,long) -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.Sb:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.Rb:
     1:1:void <init>(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,int,long):425:425 -> <init>
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.jc:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.ic:
     java.util.Comparator comparator -> b
     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.ConcurrentHashMultiset -> com.android.tools.r8.internal.ed:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset -> com.android.tools.r8.internal.dd:
     java.util.concurrent.ConcurrentMap countMap -> d
     1:3:void <init>(java.util.concurrent.ConcurrentMap):126:128 -> <init>
     1:1:java.util.concurrent.ConcurrentMap access$100(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):59:59 -> a
-    2:2:int add(java.lang.Object,int):204:204 -> a
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    3:3:int add(java.lang.Object,int):204 -> a
-    4:4:int add(java.lang.Object,int):206:206 -> a
-    5:5:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):0:0 -> a
-    5:5:int add(java.lang.Object,int):208 -> a
-    6:34:int add(java.lang.Object,int):211:239 -> a
-    35:35:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):54:54 -> a
-    35:35:int add(java.lang.Object,int):208 -> a
-    36:36:boolean setCount(java.lang.Object,int,int):404:404 -> a
-    37:37:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    37:37:boolean setCount(java.lang.Object,int,int):404 -> a
-    38:69:boolean setCount(java.lang.Object,int,int):405:436 -> a
-    70:71:java.util.Set createElementSet():449:450 -> a
-    1:1:int remove(java.lang.Object,int):272:272 -> b
-    2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):0:0 -> b
-    2:2:int remove(java.lang.Object,int):274 -> b
-    3:15:int remove(java.lang.Object,int):276:288 -> b
-    16:16:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):54:54 -> b
-    16:16:int remove(java.lang.Object,int):274 -> b
-    17:17:java.util.Set createEntrySet():487:487 -> b
-    1:1:int distinctElements():492:492 -> c
+    2:2:int remove(java.lang.Object,int):272:272 -> a
+    3:3:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):0:0 -> a
+    3:3:int remove(java.lang.Object,int):274 -> a
+    4:16:int remove(java.lang.Object,int):276:288 -> a
+    17:17:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):54:54 -> a
+    17:17:int remove(java.lang.Object,int):274 -> a
+    18:19:java.util.Set createElementSet():449:450 -> a
+    1:1:int add(java.lang.Object,int):204:204 -> b
+    2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> b
+    2:2:int add(java.lang.Object,int):204 -> b
+    3:3:int add(java.lang.Object,int):206:206 -> b
+    4:4:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):0:0 -> b
+    4:4:int add(java.lang.Object,int):208 -> b
+    5:33:int add(java.lang.Object,int):211:239 -> b
+    34:34:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkPositive(int,java.lang.String):54:54 -> b
+    34:34:int add(java.lang.Object,int):208 -> b
+    35:35:java.util.Set createEntrySet():487:487 -> b
+    1:1:boolean setCount(java.lang.Object,int,int):404:404 -> c
+    2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> c
+    2:2:boolean setCount(java.lang.Object,int,int):404 -> c
+    3:34:boolean setCount(java.lang.Object,int,int):405:436 -> c
+    35:35:int distinctElements():492:492 -> c
     1:1:void clear():554:554 -> clear
     1:1:java.util.Iterator elementIterator():480:480 -> d
     1:21:java.util.Iterator entryIterator():504:524 -> e
@@ -13954,7 +13961,7 @@
     22:25:java.util.List com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset.snapshot():181:184 -> toArray
     22:25:java.lang.Object[] toArray(java.lang.Object[]):172 -> toArray
     26:26:java.lang.Object[] toArray(java.lang.Object[]):172:172 -> toArray
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1 -> com.android.tools.r8.internal.ad:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1 -> com.android.tools.r8.internal.Zc:
     java.util.Set val$delegate -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,java.util.Set):450:450 -> <init>
     1:1:boolean contains(java.lang.Object):458:458 -> contains
@@ -13983,7 +13990,7 @@
     2:2:boolean removeAll(java.util.Collection):473 -> removeAll
     3:3:boolean com.android.tools.r8.com.google.common.collect.ForwardingSet.standardRemoveAll(java.util.Collection):77:77 -> removeAll
     3:3:boolean removeAll(java.util.Collection):473 -> removeAll
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2 -> com.android.tools.r8.internal.bd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2 -> com.android.tools.r8.internal.ad:
     java.util.Iterator mapEntries -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):505:507 -> <init>
     1:7:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2.computeNext():512:518 -> j
@@ -13991,7 +13998,7 @@
     8:8:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):235:235 -> j
     8:8:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2.computeNext():518 -> j
     8:8:java.lang.Object computeNext():505 -> j
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3 -> com.android.tools.r8.internal.cd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3 -> com.android.tools.r8.internal.bd:
     java.util.Iterator val$readOnlyIterator -> c
     com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset this$0 -> d
     com.android.tools.r8.com.google.common.collect.Multiset$Entry last -> b
@@ -14004,7 +14011,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():540 -> remove
     3:4:void remove():541:542 -> remove
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet -> com.android.tools.r8.internal.dd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet -> com.android.tools.r8.internal.cd:
     com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):558:558 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1):558:558 -> <init>
@@ -14048,7 +14055,7 @@
     19:19:java.util.List com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet.snapshot():582:582 -> toArray
     19:19:java.lang.Object[] toArray(java.lang.Object[]):576 -> toArray
     20:20:java.lang.Object[] toArray(java.lang.Object[]):576:576 -> toArray
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.Ud:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.Td:
     int value -> b
     1:2:void <init>(int):30:31 -> <init>
     1:1:void add(int):39:39 -> a
@@ -14059,11 +14066,11 @@
     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.Rh:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.Mh:
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> h
     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.Nk:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.Ik:
     com.android.tools.r8.com.google.common.base.Optional iterableDelegate -> b
     1:2:void <init>():118:119 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concat(java.lang.Iterable,java.lang.Iterable):191:191 -> a
@@ -14105,7 +14112,7 @@
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):281:290 -> toString
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):241 -> toString
     3:12:java.lang.String toString():337 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.Kk:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.Fk:
     java.lang.Iterable val$inputs -> c
     1:1:void <init>(java.lang.Iterable):274:274 -> <init>
     1:1:java.util.Iterator iterator():277:277 -> iterator
@@ -14115,18 +14122,18 @@
     3:4:java.util.Iterator iterator():277 -> iterator
     5:5:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):546:546 -> iterator
     5:5:java.util.Iterator iterator():277 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.Mk:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.Hk:
     java.lang.Iterable[] val$inputs -> c
     1:1:void <init>(java.lang.Iterable[]):288:288 -> <init>
     1:1:java.util.Iterator iterator():291:291 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):546:546 -> iterator
     2:2:java.util.Iterator iterator():291 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$3$1 -> com.android.tools.r8.internal.Lk:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3$1 -> com.android.tools.r8.internal.Gk:
     com.android.tools.r8.com.google.common.collect.FluentIterable$3 this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$3,int):293:293 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.FluentIterable$3$1.get(int):296:296 -> a
     1:1:java.lang.Object get(int):293 -> a
-com.android.tools.r8.com.google.common.collect.ForwardingIterator -> com.android.tools.r8.internal.Xk:
+com.android.tools.r8.com.google.common.collect.ForwardingIterator -> com.android.tools.r8.internal.Sk:
     1:1:void <init>():42:42 -> <init>
     1:1:boolean hasNext():49:49 -> hasNext
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3.delegate():529:529 -> hasNext
@@ -14136,11 +14143,11 @@
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3.delegate():529:529 -> next
     2:2:java.lang.Object next():55 -> next
     3:3:java.lang.Object next():55:55 -> next
-com.android.tools.r8.com.google.common.collect.ForwardingObject -> com.android.tools.r8.internal.Yk:
+com.android.tools.r8.com.google.common.collect.ForwardingObject -> com.android.tools.r8.internal.Tk:
     1:1:void <init>():50:50 -> <init>
     java.lang.Object delegate() -> j
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.com.google.common.collect.ForwardingSet -> com.android.tools.r8.internal.Zk:
+com.android.tools.r8.com.google.common.collect.ForwardingSet -> com.android.tools.r8.internal.Uk:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingCollection.<init>():53:53 -> <init>
     1:1:void <init>():53 -> <init>
     boolean com.android.tools.r8.com.google.common.collect.ForwardingCollection.standardContainsAll(java.util.Collection) -> a
@@ -14254,7 +14261,7 @@
     6:6:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ForwardingCollection.toArray(java.lang.Object[]):126:126 -> toArray
     6:6:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ForwardingCollection.toArray(java.lang.Object[]):0 -> toArray
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.ym:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.tm:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableKToV -> b
@@ -14339,19 +14346,19 @@
     2:2:java.util.Set values():493:493 -> values
     3:3:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.keySet():630:630 -> values
     3:3:java.util.Set values():493 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.om:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.jm:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):498:498 -> <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):501:501 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):498 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.nm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.im:
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):507:508 -> <init>
     1:1:java.lang.Object getKey():513:513 -> getKey
     1:1:java.lang.Object getValue():518:518 -> getValue
     1:16:java.lang.Object setValue(java.lang.Object):523:538 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.pm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.km:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> f
     int keyHash -> d
     int valueHash -> e
@@ -14359,7 +14366,7 @@
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKeyInsertionOrder -> h
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> i
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):104:106 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.um:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.pm:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):573:573 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):573:573 -> <init>
@@ -14406,27 +14413,27 @@
     4:4:java.util.Set values():662:662 -> values
     5:5:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.keySet():459:459 -> values
     5:5:java.util.Set values():662 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.rm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.mm:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> g
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):667:667 -> <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):670:670 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):667 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.qm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.lm:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> 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):676:677 -> <init>
     1:1:java.lang.Object getKey():682:682 -> getKey
     1:1:java.lang.Object getValue():687:687 -> getValue
     1:12:java.lang.Object setValue(java.lang.Object):692:703 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.tm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.om:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):634:635 -> <init>
     1:1:java.util.Iterator iterator():651:651 -> iterator
     1:5:boolean remove(java.lang.Object):640:644 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.sm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.nm:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):651:651 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):654:654 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.vm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.qm:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> f
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> b
@@ -14443,33 +14450,33 @@
     5:5:void remove():448 -> remove
     6:8:void remove():449:451 -> remove
     9:9:void remove():446:446 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.xm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.sm:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):463:464 -> <init>
     1:1:java.util.Iterator iterator():469:469 -> iterator
     1:7:boolean remove(java.lang.Object):479:485 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.wm:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.rm:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):469:469 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):472:472 -> a
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.Em:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.zm:
     1:1:void <init>():66:66 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.HashMultiset create():38:38 -> f
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.isEmpty():50:50 -> isEmpty
     1:1:boolean isEmpty():33 -> isEmpty
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.iterator():185:185 -> iterator
     1:1:java.util.Iterator iterator():33 -> iterator
-com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.Km:
+com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.Fm:
     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.Rn:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.Nn:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     1:1:boolean isPartialView():56:56 -> e
     1:1:boolean isEmpty():51:51 -> isEmpty
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> j
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Tn:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Pn:
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim.<init>():32:32 -> <init>
     1:1:void <init>():372 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):407:407 -> a
@@ -14483,7 +14490,7 @@
     1:1:java.util.Collection values():41 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():388:388 -> values
     2:2:java.util.Set values():41 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.Sn:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.On:
     1:1:void <init>():176:176 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder orderEntriesByValue(java.util.Comparator) -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():170:170 -> a
@@ -14502,7 +14509,7 @@
     33:33:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():272 -> b
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():67:67 -> b
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():270 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Vn:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Rn:
     java.lang.Object[] EMPTY_ARRAY -> b
     1:1:void <clinit>():187:187 -> <clinit>
     1:1:void <init>():176:176 -> <init>
@@ -14539,18 +14546,18 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> toArray
     3:3:java.lang.Object[] toArray(java.lang.Object[]):197 -> toArray
     4:15:java.lang.Object[] toArray(java.lang.Object[]):198:209 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Un:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Qn:
     1:1:void <init>():404:404 -> <init>
     1:1:int expandedCapacity(int,int):395:395 -> a
     2:2:int expandedCapacity(int,int):390:390 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Xn:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Tn:
     java.lang.Object key -> b
     java.lang.Object value -> c
     1:3:void <init>(java.lang.Object,java.lang.Object):29:31 -> <init>
     1:1:java.lang.Object getKey():36:36 -> getKey
     1:1:java.lang.Object getValue():41:41 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):46:46 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Yn:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Un:
     java.util.EnumMap delegate -> f
     1:3:void <init>(java.util.EnumMap):51:53 -> <init>
     1:8:com.android.tools.r8.com.google.common.collect.ImmutableMap asImmutable(java.util.EnumMap):38:45 -> a
@@ -14578,7 +14585,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94:94 -> u
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntryIterator(java.util.Iterator):1361:1361 -> u
     2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> u
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Zn:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Vn:
     java.util.EnumSet delegate -> e
     int hashCode -> f
     1:2:void <init>(java.util.EnumSet):57:58 -> <init>
@@ -14606,7 +14613,7 @@
     1:1:int size():83:83 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
     1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.go:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.co:
     int $r8$clinit -> c
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
@@ -14734,11 +14741,11 @@
     1:1:void sort(java.util.Comparator):565:565 -> sort
     1:1:java.util.Spliterator spliterator():580:580 -> spliterator
     1:1:java.util.List subList(int,int):60:60 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.co:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Yn:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> d
     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.do:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.Zn:
     java.lang.Object[] contents -> a
     int size -> b
     boolean forceCopy -> c
@@ -14760,7 +14767,7 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):793 -> b
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):794:795 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.eo:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.ao:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):607:608 -> <init>
     1:1:boolean contains(java.lang.Object):626:626 -> contains
@@ -14796,7 +14803,7 @@
     2:2:java.util.ListIterator listIterator(int):604:604 -> listIterator
     1:1:int size():655:655 -> size
     1:1:java.util.List subList(int,int):604:604 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.fo:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.bo:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> f
     int offset -> d
     int length -> e
@@ -14812,14 +14819,14 @@
     2:2:java.util.ListIterator listIterator(int):455:455 -> listIterator
     1:1:int size():466:466 -> size
     1:1:java.util.List subList(int,int):455:455 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.io:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.eo:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):377:377 -> <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):390:391 -> get
     1:2:java.util.Collection get(java.lang.Object):50 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():83:83 -> 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):391 -> get
     3:3:java.util.Collection get(java.lang.Object):50 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.ho:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.do:
     1:1:void <init>():213:213 -> <init>
     1:4: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):162:165 -> a
     1:4:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):218 -> a
@@ -14840,7 +14847,7 @@
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.fromMapEntries(java.util.Collection,java.util.Comparator):356:373 -> a
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():292 -> a
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():302 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.no:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.jo:
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> e
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> b
@@ -14926,12 +14933,12 @@
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3607:3616 -> toString
     4:13:java.lang.String toString():894 -> toString
     1:1:java.util.Collection values():63:63 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.jo:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.fo:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):752:752 -> <init>
     1:1:boolean hasNext():755:755 -> hasNext
     1:1:java.lang.Object next():760:760 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.ko:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.go:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -14962,7 +14969,7 @@
     37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap build():386 -> a
     38:38:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.com.google.common.collect.ImmutableMap.of():110:110 -> a
     38:38:com.android.tools.r8.com.google.common.collect.ImmutableMap build():384 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap -> com.android.tools.r8.internal.mo:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap -> com.android.tools.r8.internal.io:
     1:1:void <init>():475:475 -> <init>
     1:1:java.util.Set entrySet():475:475 -> entrySet
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():503:503 -> k
@@ -14971,28 +14978,28 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():508:508 -> m
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator() -> u
     1:1:java.util.Collection values():475:475 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.lo:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.ho:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):492:492 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():500:500 -> f
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl.iterator():500:500 -> iterator
     1:1:java.util.Iterator iterator():492 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():495:495 -> k
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.qo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.mo:
     1:2:void <init>(java.lang.Object,java.lang.Object):47:48 -> <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.oo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.ko:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> e
     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):102:103 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():109:109 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.po:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.lo:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):78:79 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():84:84 -> b
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.so:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.oo:
     1:1:void <init>():80:80 -> <init>
     1:4:boolean contains(java.lang.Object):91:94 -> contains
     1:1:boolean isPartialView():101:101 -> e
@@ -15002,7 +15009,7 @@
     2:2:boolean isHashCodeFast():107 -> i
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> k
     1:1:int size():86:86 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.ro:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.no:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList):43:45 -> <init>
@@ -15014,7 +15021,7 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> k
     1:1:java.util.Spliterator spliterator():66:66 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.to:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.po:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):38:39 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):70:70 -> a
@@ -15030,7 +15037,7 @@
     1:1:java.util.Iterator iterator():34 -> iterator
     1:1:int size():44:44 -> size
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.wo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.so:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):36:36 -> a
@@ -15057,18 +15064,18 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> 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.uo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.qo:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):50:51 -> <init>
     1:1:boolean hasNext():55:55 -> hasNext
     1:1:java.lang.Object next():60:60 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.ro:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> d
     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:java.lang.Object get(int):86:86 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.Bo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.xo:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> f
     int size -> g
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):345:347 -> <init>
@@ -15108,7 +15115,7 @@
     1:1:int size():482:482 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():263:263 -> toString
     1:1:java.lang.String toString():68 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.xo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.to:
     java.util.Iterator valueItr -> d
     java.util.Iterator asMapItr -> b
     java.lang.Object currentKey -> c
@@ -15119,10 +15126,10 @@
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1320:1320 -> next
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.next():581 -> next
     7:7:java.lang.Object next():563 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.yo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.uo:
     java.util.Map builderMap -> a
     1:2:void <init>():151:152 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.zo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.vo:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):530:531 -> <init>
     1:3:boolean contains(java.lang.Object):551:553 -> contains
@@ -15139,7 +15146,7 @@
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():482:482 -> size
     2:2:int size():546 -> size
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.Ao:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.wo:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> f
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):625:625 -> <init>
     1:1:boolean contains(java.lang.Object):628:628 -> contains
@@ -15163,16 +15170,16 @@
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():482:482 -> size
     2:2:int size():644 -> size
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.Go:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.Co:
     int $r8$clinit -> e
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies.<init>():40:40 -> <init>
     1:1:void <init>():223 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableList asList():254:255 -> a
-    3:3:int add(java.lang.Object,int):274:274 -> a
-    4:4:boolean setCount(java.lang.Object,int,int):316:316 -> a
-    5:7:int copyIntoArray(java.lang.Object[],int):322:324 -> a
+    3:5:int copyIntoArray(java.lang.Object[],int):322:324 -> a
+    1:1:int add(java.lang.Object,int):274:274 -> b
+    1:1:boolean setCount(java.lang.Object,int,int):316:316 -> c
     1:1:boolean contains(java.lang.Object):260:260 -> contains
     1:1:java.util.Set entrySet():54:54 -> entrySet
     1:1:boolean equals(java.lang.Object):331:331 -> equals
@@ -15194,14 +15201,14 @@
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():353:353 -> i
     1:1:java.lang.String toString():341:341 -> toString
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys.elementSet():623:623 -> x
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.Co:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.yo:
     java.util.Iterator val$entryIterator -> d
     java.lang.Object element -> c
     int remaining -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):228:228 -> <init>
     1:1:boolean hasNext():234:234 -> hasNext
     1:7:java.lang.Object next():239:245 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.Do:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.zo:
     com.android.tools.r8.com.google.common.collect.Multiset contents -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):463:464 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):477:477 -> a
@@ -15221,7 +15228,7 @@
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):219:219 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyOf(java.lang.Iterable):193 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset build():567 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Eo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Ao:
     java.util.List entries -> e
     com.android.tools.r8.com.google.common.collect.Multiset delegate -> f
     1:3:void <init>(java.util.List,com.android.tools.r8.com.google.common.collect.Multiset):584:586 -> <init>
@@ -15229,7 +15236,7 @@
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):591:591 -> get
     1:1:int size():606:606 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.Fo:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.Bo:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):363:363 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):363:363 -> <init>
@@ -15239,7 +15246,7 @@
     1:1:java.lang.Object get(int):362 -> get
     1:1:int hashCode():394:394 -> hashCode
     1:1:int size():376:376 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.No:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.Jo:
     int $r8$clinit -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
     1:1:void <init>():302:302 -> <init>
@@ -15290,7 +15297,7 @@
     boolean isHashCodeFast() -> i
     1:13:int chooseTableSize(int):643:655 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():75:75 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.Ho:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.Do:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl impl -> a
     boolean forceCopy -> b
     1:1:void <init>():481:481 -> <init>
@@ -15318,7 +15325,7 @@
     5:5:void com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.copyIfNecessary():500:500 -> b
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):512 -> b
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):513:513 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.Jo:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.Fo:
     1:1:void <init>():345:345 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):369:369 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():350:350 -> f
@@ -15330,13 +15337,13 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed.iterator():350:350 -> iterator
     1:1:java.util.Iterator iterator():345 -> iterator
     1:1:java.util.Spliterator spliterator():355:355 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.Io:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.Eo:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):374:374 -> <init>
     1:1:java.lang.Object get(int):377:377 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1.delegateCollection():382:382 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():374 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$JdkBackedSetBuilderImpl -> com.android.tools.r8.internal.Ko:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$JdkBackedSetBuilderImpl -> com.android.tools.r8.internal.Go:
     java.util.Set delegate -> c
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl):847:850 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object):856:856 -> a
@@ -15351,7 +15358,7 @@
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():75:75 -> a
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet build():872 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl copy():865:865 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl -> com.android.tools.r8.internal.Lo:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl -> com.android.tools.r8.internal.Ho:
     java.lang.Object[] hashTable -> c
     int hashCode -> f
     int maxRunBeforeFallback -> d
@@ -15382,7 +15389,7 @@
     4:12:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ImmutableSet.rebuildHashTable(int,java.lang.Object[],int):442:450 -> c
     4:12:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():816 -> c
     13:17:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():816:820 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl -> com.android.tools.r8.internal.Mo:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl -> com.android.tools.r8.internal.Io:
     java.lang.Object[] dedupedElements -> a
     int distinct -> b
     1:3:void <init>(int):566:568 -> <init>
@@ -15395,7 +15402,7 @@
     2:5:void addDedupedElement(java.lang.Object):591 -> b
     6:6:void addDedupedElement(java.lang.Object):592:592 -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review() -> c
-com.android.tools.r8.com.google.common.collect.IndexedImmutableSet -> com.android.tools.r8.internal.ap:
+com.android.tools.r8.com.google.common.collect.IndexedImmutableSet -> com.android.tools.r8.internal.To:
     1:1:void <init>():27:27 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):52:52 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():32:32 -> f
@@ -15405,14 +15412,14 @@
     3:5:void forEach(java.util.function.Consumer):43:45 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():57:57 -> h
     1:1:java.util.Spliterator spliterator():37:37 -> spliterator
-com.android.tools.r8.com.google.common.collect.IndexedImmutableSet$1 -> com.android.tools.r8.internal.Zo:
+com.android.tools.r8.com.google.common.collect.IndexedImmutableSet$1 -> com.android.tools.r8.internal.So:
     com.android.tools.r8.com.google.common.collect.IndexedImmutableSet this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.IndexedImmutableSet):57:57 -> <init>
     1:1:boolean isPartialView():65:65 -> e
     1:1:java.lang.Object get(int):60:60 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():75:75 -> j
     1:1:int size():70:70 -> size
-com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.Wu:
+com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.Pu:
     1:2:boolean contains(java.lang.Iterable,java.lang.Object):136:137 -> a
     3:5:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):101:103 -> a
     3:5:boolean contains(java.lang.Iterable,java.lang.Object):138 -> a
@@ -15475,12 +15482,12 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> d
     2:2:java.lang.Iterable skip(java.lang.Iterable,int):852 -> d
     3:5:java.lang.Iterable skip(java.lang.Iterable,int):853:855 -> d
-com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Ru:
+com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Ku:
     1:1:void <init>():1023:1023 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):1023:1023 -> apply
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$10.apply(java.lang.Iterable):1026:1026 -> apply
     2:2:java.lang.Object apply(java.lang.Object):1023 -> apply
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.Su:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.Lu:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     java.lang.Iterable val$unfiltered -> c
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):556:556 -> <init>
@@ -15511,7 +15518,7 @@
     4:4:java.util.Spliterator spliterator():575 -> spliterator
     5:5:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):194:194 -> spliterator
     5:5:java.util.Spliterator spliterator():575 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.Tu:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.Mu:
     java.lang.Iterable val$fromIterable -> c
     com.android.tools.r8.com.google.common.base.Function val$function -> d
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):695:695 -> <init>
@@ -15529,7 +15536,7 @@
     4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.transform(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):780:780 -> iterator
     4:4:java.util.Iterator iterator():698 -> iterator
     1:1:java.util.Spliterator spliterator():709:709 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.Vu:
+com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.Ou:
     int val$numberToSkip -> d
     java.lang.Iterable val$iterable -> c
     1:1:void <init>(java.lang.Iterable,int):855:855 -> <init>
@@ -15543,7 +15550,7 @@
     11:15:java.util.Iterator iterator():865 -> iterator
     16:16:java.util.Iterator iterator():872:872 -> iterator
     1:6:java.util.Spliterator spliterator():897:902 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.Uu:
+com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.Nu:
     java.util.Iterator val$iterator -> c
     boolean atStart -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Iterables$6,java.util.Iterator):872:873 -> <init>
@@ -15553,77 +15560,77 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():889 -> remove
     3:3:void remove():890:890 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.kv:
+com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.dv:
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():88:88 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator emptyIterator():77 -> a
-    2:2:boolean addAll(java.util.Collection,java.util.Iterator):352:352 -> a
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    3:3:boolean addAll(java.util.Collection,java.util.Iterator):352 -> a
-    4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    4:4:boolean addAll(java.util.Collection,java.util.Iterator):353 -> a
-    5:6:boolean addAll(java.util.Collection,java.util.Iterator):355:356 -> a
-    7:7:java.util.Iterator cycle(java.lang.Iterable):390:390 -> a
+    2:6:boolean removeAll(java.util.Iterator,java.util.Collection):198:202 -> a
+    7:7:boolean addAll(java.util.Collection,java.util.Iterator):352:352 -> a
     8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    8:8:java.util.Iterator cycle(java.lang.Iterable):390 -> a
-    9:9:java.util.Iterator cycle(java.lang.Iterable):391:391 -> a
-    10:10:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):480:480 -> a
-    11:11:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    11:11:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):480 -> a
-    12:12:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    12:12:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):481 -> a
-    13:13:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):482:482 -> a
-    14:14:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.consumingForArray(java.lang.Object[]):450:450 -> a
-    14:14:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):482 -> a
-    15:15:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):546:546 -> a
-    15:15:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):482 -> a
-    16:19:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):759:762 -> a
-    16:19:boolean any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):661 -> a
-    20:20:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
-    20:20:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):759 -> a
-    20:20:boolean any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):661 -> a
-    21:21:java.util.Iterator limit(java.util.Iterator,int):905:905 -> a
-    22:22:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    22:22:java.util.Iterator limit(java.util.Iterator,int):905 -> a
-    23:24:java.util.Iterator limit(java.util.Iterator,int):906:907 -> a
-    25:25:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001:1001 -> a
-    26:31:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1013:1018 -> a
-    26:31:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
-    32:32:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():88:88 -> a
-    32:32:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1020 -> a
-    32:32:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
-    33:33:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1022:1022 -> a
-    33:33:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
-    34:34:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator singletonIterator(java.lang.Object):1049:1049 -> a
-    1:5:boolean removeAll(java.util.Iterator,java.util.Collection):198:202 -> b
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.av:
+    8:8:boolean addAll(java.util.Collection,java.util.Iterator):352 -> a
+    9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    9:9:boolean addAll(java.util.Collection,java.util.Iterator):353 -> a
+    10:11:boolean addAll(java.util.Collection,java.util.Iterator):355:356 -> a
+    12:12:java.util.Iterator cycle(java.lang.Iterable):390:390 -> a
+    13:13:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    13:13:java.util.Iterator cycle(java.lang.Iterable):390 -> a
+    14:14:java.util.Iterator cycle(java.lang.Iterable):391:391 -> a
+    15:15:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):480:480 -> a
+    16:16:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    16:16:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):480 -> a
+    17:17:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    17:17:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):481 -> a
+    18:18:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):482:482 -> a
+    19:19:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.consumingForArray(java.lang.Object[]):450:450 -> a
+    19:19:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):482 -> a
+    20:20:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):546:546 -> a
+    20:20:java.util.Iterator concat(java.util.Iterator,java.util.Iterator):482 -> a
+    21:24:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):759:762 -> a
+    21:24:boolean any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):661 -> a
+    25:25:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
+    25:25:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):759 -> a
+    25:25:boolean any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):661 -> a
+    26:26:java.util.Iterator limit(java.util.Iterator,int):905:905 -> a
+    27:27:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    27:27:java.util.Iterator limit(java.util.Iterator,int):905 -> a
+    28:29:java.util.Iterator limit(java.util.Iterator,int):906:907 -> a
+    30:30:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001:1001 -> a
+    31:36:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1013:1018 -> a
+    31:36:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():88:88 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1020 -> a
+    37:37:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
+    38:38:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[],int,int,int):1022:1022 -> a
+    38:38:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
+    39:39:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator singletonIterator(java.lang.Object):1049:1049 -> a
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Tu:
     java.util.Iterator val$iterator -> b
     1:1:void <init>(java.util.Iterator):133:133 -> <init>
     1:1:boolean hasNext():136:136 -> hasNext
     1:1:java.lang.Object next():141:141 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.bv:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Uu:
     java.util.Iterator iterator -> b
     java.lang.Iterable val$iterable -> c
     1:2:void <init>(java.lang.Iterable):391:392 -> <init>
     1:1:boolean hasNext():405:405 -> hasNext
     1:7:java.lang.Object next():410:416 -> next
     1:1:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.cv:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Vu:
     java.lang.Object[] val$elements -> c
     int index -> b
     1:2:void <init>(java.lang.Object[]):450:451 -> <init>
     1:1:boolean hasNext():455:455 -> hasNext
     1:6:java.lang.Object next():460:465 -> next
     7:7:java.lang.Object next():461:461 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.dv:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Wu:
     java.util.Iterator val$unfiltered -> d
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> e
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):632:632 -> <init>
     1:7:java.lang.Object computeNext():635:641 -> j
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.ev:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Xu:
     com.android.tools.r8.com.google.common.base.Function val$function -> c
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):780:780 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):783:783 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.fv:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.Yu:
     java.util.Iterator val$iterator -> d
     int count -> b
     int val$limitSize -> c
@@ -15632,21 +15639,21 @@
     1:5:java.lang.Object next():917:921 -> next
     6:6:java.lang.Object next():918:918 -> next
     1:1:void remove():926:926 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.gv:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.Zu:
     java.lang.Object val$value -> c
     boolean done -> b
     1:1:void <init>(java.lang.Object):1049:1049 -> <init>
     1:1:boolean hasNext():1054:1054 -> hasNext
     1:5:java.lang.Object next():1059:1063 -> next
     6:6:java.lang.Object next():1060:1060 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.hv:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.av:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> f
     int offset -> e
     1:1:void <clinit>():1026:1026 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1032:1034 -> <init>
     1:1:java.lang.Object get(int):1039:1039 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.iv:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.bv:
     java.util.Iterator topMetaIterator -> d
     java.util.Iterator iterator -> c
     java.util.Iterator toRemove -> b
@@ -15666,14 +15673,14 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():1372 -> remove
     3:4:void remove():1373:1374 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.jv:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.cv:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> b
     1:1:void <clinit>():96:96 -> <clinit>
     1:1:void <init>(java.lang.String,int):95:95 -> <init>
     1:1:java.lang.Object next():105:105 -> next
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     1:1:void remove():110 -> remove
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap -> com.android.tools.r8.internal.sv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap -> com.android.tools.r8.internal.lv:
     com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap inverse -> i
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> f
     java.util.Map forwardDelegate -> g
@@ -15710,7 +15717,7 @@
     boolean isPartialView() -> o
     1:1:int size():65:65 -> size
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():72:78 -> u
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries -> com.android.tools.r8.internal.rv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries -> com.android.tools.r8.internal.kv:
     com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap):84:84 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap,com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$1):84:84 -> <init>
@@ -15721,7 +15728,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries.get(int):88 -> get
     3:3:java.lang.Object get(int):83 -> get
     1:1:int size():98:98 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMap -> com.android.tools.r8.internal.tv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMap -> com.android.tools.r8.internal.mv:
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
     java.util.Map delegateMap -> f
     1:3:void <init>(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableList):53:55 -> <init>
@@ -15746,7 +15753,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():86:86 -> m
     boolean isPartialView() -> o
     1:1:int size():60:60 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset -> com.android.tools.r8.internal.uv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset -> com.android.tools.r8.internal.nv:
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet -> i
     long size -> h
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
@@ -15767,7 +15774,7 @@
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():72:73 -> h
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):78:78 -> h
     1:1:int size():88:88 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableSet -> com.android.tools.r8.internal.vv:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableSet -> com.android.tools.r8.internal.ov:
     java.util.Set delegate -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> f
     1:3:void <init>(java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList):33:35 -> <init>
@@ -15775,7 +15782,7 @@
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):40:40 -> get
     1:1:int size():55:55 -> size
-com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.TB:
+com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.MB:
     1:1:void <init>():74:74 -> <init>
     2:2:void <init>(int):78:78 -> <init>
     1:2:int com.android.tools.r8.com.google.common.collect.Multisets.inferDistinctElements(java.lang.Iterable):378:379 -> a
@@ -15788,7 +15795,7 @@
     1:1:boolean isEmpty():41 -> isEmpty
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.iterator():185:185 -> iterator
     1:1:java.util.Iterator iterator():41 -> iterator
-com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.hC:
+com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.aC:
     1:1:java.util.ArrayList newArrayList(java.lang.Object[]):103:103 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     2:2:java.util.ArrayList newArrayList(java.lang.Object[]):103 -> a
@@ -15812,9 +15819,9 @@
     27:44:boolean equalsImpl(java.util.List,java.lang.Object):969:986 -> a
     45:55:boolean com.android.tools.r8.com.google.common.collect.Iterators.elementsEqual(java.util.Iterator,java.util.Iterator):263:273 -> a
     45:55:boolean equalsImpl(java.util.List,java.lang.Object):986 -> a
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.eC:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.XB:
     1:1:void <init>(java.util.List):947:947 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.gC:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.ZB:
     java.util.List forwardList -> b
     1:2:void <init>(java.util.List):810:811 -> <init>
     1:1:java.util.List getForwardList():815:815 -> a
@@ -15879,7 +15886,7 @@
     7:7:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):826:826 -> subList
     7:7:java.util.List subList(int,int):868 -> subList
     8:8:java.util.List subList(int,int):868:868 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.YB:
     java.util.ListIterator val$forwardIterator -> c
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> d
     boolean canRemoveOrSet -> b
@@ -15904,7 +15911,7 @@
     1:2:void set(java.lang.Object):938:939 -> set
     3:3:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean):494:494 -> set
     3:3:void set(java.lang.Object):938 -> set
-com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.GD:
+com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.zD:
     1:1:java.util.HashMap newHashMap():226:226 -> a
     2:2:int capacity(int):268:268 -> a
     3:3:java.lang.Object safeGet(java.util.Map,java.lang.Object):3513:3513 -> a
@@ -15914,22 +15921,22 @@
     1:1:java.util.HashMap newHashMapWithExpectedSize(int):259:259 -> b
     2:2:java.util.IdentityHashMap newIdentityHashMap():431:431 -> b
     1:1:java.util.LinkedHashMap newLinkedHashMapWithExpectedSize(int):325:325 -> c
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.uD:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.nD:
     1:1:void <init>(java.util.Iterator):117:117 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):117:117 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$1.transform(java.util.Map$Entry):120:120 -> a
     2:2:java.lang.Object transform(java.lang.Object):117 -> a
-com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.vD:
+com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.oD:
     1:1:void <init>(java.util.Iterator):126:126 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):126:126 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$2.transform(java.util.Map$Entry):129:129 -> a
     2:2:java.lang.Object transform(java.lang.Object):126 -> a
-com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.wD:
+com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.pD:
     java.util.Map$Entry val$entry -> b
     1:1:void <init>(java.util.Map$Entry):1346:1346 -> <init>
     1:1:java.lang.Object getKey():1349:1349 -> getKey
     1:1:java.lang.Object getValue():1354:1354 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.xD:
+com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.qD:
     java.util.Iterator val$entryIterator -> b
     1:1:void <init>(java.util.Iterator):1361:1361 -> <init>
     1:1:boolean hasNext():1364:1364 -> hasNext
@@ -15945,23 +15952,23 @@
     4:4:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1346:1346 -> next
     4:4:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps$8.next():1369 -> next
     4:4:java.lang.Object next():1361 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.AD:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.tD:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> c
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> b
     1:7:void <clinit>():92:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):91:91 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):91:91 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.yD:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.rD:
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):92:92 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1.apply(java.util.Map$Entry):95:95 -> apply
     2:2:java.lang.Object apply(java.lang.Object):92 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.zD:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.sD:
     1:1:void <init>(java.lang.String,int):98:98 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):98:98 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2.apply(java.util.Map$Entry):101:101 -> apply
     2:2:java.lang.Object apply(java.lang.Object):98 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.BD:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.uD:
     1:1:void <init>():3900:3900 -> <init>
     java.util.Map map() -> a
     1:1:void clear():3910:3910 -> clear
@@ -15979,21 +15986,21 @@
     2:2:boolean retainAll(java.util.Collection):3951 -> retainAll
     3:13:boolean retainAll(java.util.Collection):3951:3961 -> retainAll
     1:1:int size():3905:3905 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.DD:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.wD:
     1:1:void <init>():3462:3462 -> <init>
     1:1:void forEachEntry(java.util.function.Consumer):3499:3499 -> a
     1:1:java.util.Set entrySet():3475:3475 -> entrySet
     java.util.Iterator entryIterator() -> f
     1:1:java.util.Spliterator entrySpliterator():3470:3470 -> k
     2:2:java.util.Spliterator entrySpliterator():3469:3469 -> k
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.CD:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.vD:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3475:3475 -> <init>
     1:1:java.util.Map map():3478:3478 -> a
     1:1:void forEach(java.util.function.Consumer):3493:3493 -> forEach
     1:1:java.util.Iterator iterator():3483:3483 -> iterator
     1:1:java.util.Spliterator spliterator():3488:3488 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.ED:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.xD:
     java.util.Map map -> b
     1:2:void <init>(java.util.Map):3629:3630 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3646:3646 -> a
@@ -16013,7 +16020,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3634:3634 -> size
     1:1:int size():3651 -> size
     2:2:int size():3651:3651 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.FD:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.yD:
     java.util.Map map -> b
     1:2:void <init>(java.util.Map):3814:3815 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3831:3831 -> a
@@ -16069,16 +16076,16 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$Values.map():3819:3819 -> size
     1:1:int size():3881 -> size
     2:2:int size():3881:3881 -> size
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.SF:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.LF:
     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.Multimaps$Keys -> com.android.tools.r8.internal.VF:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.OF:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1664:1665 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1697:1697 -> a
-    1:19:int remove(java.lang.Object,int):1728:1746 -> b
+    2:20:int remove(java.lang.Object,int):1728:1746 -> a
     1:1:int distinctElements():1702:1702 -> c
     1:1:void clear():1754:1754 -> clear
     1:1:boolean contains(java.lang.Object):1712:1712 -> contains
@@ -16095,26 +16102,26 @@
     1:1:int size():1707:1707 -> size
     1:1:java.util.Spliterator spliterator():1691:1691 -> spliterator
     1:1:java.util.Set elementSet():1759:1759 -> x
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.UF:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.NF:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1671:1671 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1671:1671 -> 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):1674:1674 -> a
     2:2:java.lang.Object transform(java.lang.Object):1671 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.TF:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.MF:
     java.util.Map$Entry val$backingEntry -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1674:1674 -> <init>
     1:1:int getCount():1682:1682 -> a
     1:1:java.lang.Object getElement():1677:1677 -> b
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.XF:
-    int add(java.lang.Object,int) -> a
-    boolean setCount(java.lang.Object,int,int) -> a
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.QF:
+    int remove(java.lang.Object,int) -> a
     1:1:void forEachEntry(java.util.function.ObjIntConsumer):338:338 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     2:2:void forEachEntry(java.util.function.ObjIntConsumer):338 -> a
     3:3:void forEachEntry(java.util.function.ObjIntConsumer):339:339 -> a
     4:4:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):339:339 -> a
     5:8:void lambda$forEach$1(java.util.function.Consumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):463:466 -> a
-    int remove(java.lang.Object,int) -> b
+    int add(java.lang.Object,int) -> b
+    boolean setCount(java.lang.Object,int,int) -> c
     int setCount(java.lang.Object,int) -> f
     1:1:void forEach(java.util.function.Consumer):459:459 -> forEach
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> forEach
@@ -16123,10 +16130,10 @@
     int count(java.lang.Object) -> g
     1:1:java.util.Spliterator spliterator():473:473 -> spliterator
     java.util.Set elementSet() -> x
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.WF:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.PF:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.cG:
+com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.VF:
     1:13:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):858:870 -> a
     14:14:boolean addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):881:881 -> a
     15:15:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
@@ -16149,26 +16156,26 @@
     42:42:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1131 -> a
     43:43:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyFromEntries(java.util.Collection):219:219 -> a
     43:43:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1131 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.YF:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.RF:
     1:1:void <init>():814:814 -> <init>
     1:4:boolean equals(java.lang.Object):821:824 -> equals
     1:2:int hashCode():835:836 -> hashCode
     1:3:java.lang.String toString():847:849 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.ZF:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.SF:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> b
     1:1:void <clinit>():1135:1135 -> <clinit>
     1:1:void <init>():1134:1134 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1134:1134 -> 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):1139:1139 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1134 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.aG:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.TF:
     java.lang.Object element -> b
     int count -> c
     1:4:void <init>(java.lang.Object,int):242:245 -> <init>
     1:1:int getCount():255:255 -> a
     1:1:java.lang.Object getElement():250:250 -> b
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.Multisets$MultisetIteratorImpl -> com.android.tools.r8.internal.bG:
+com.android.tools.r8.com.google.common.collect.Multisets$MultisetIteratorImpl -> com.android.tools.r8.internal.UF:
     java.util.Iterator entryIterator -> c
     com.android.tools.r8.com.google.common.collect.Multiset$Entry currentEntry -> d
     int totalCount -> f
@@ -16183,7 +16190,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():1085 -> remove
     3:9:void remove():1086:1092 -> remove
-com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.JJ:
+com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.zJ:
     1:1:java.lang.Object[] newArray(java.lang.Object[],int):59:59 -> a
     2:7:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):84:89 -> a
     2:7:java.lang.Object[] newArray(java.lang.Object[],int):59 -> a
@@ -16193,9 +16200,9 @@
     10:10:java.lang.Object com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementNotNull(java.lang.Object,int):225:225 -> a
     10:10:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):215 -> a
     10:10:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):209 -> a
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.PK:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.FK:
     1:1:void <init>():391:391 -> <init>
-com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.ML:
+com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.CL:
 # {"id":"sourceFile","fileName":"Platform.java"}
     int $r8$clinit -> a
     1:1:void <clinit>():33:33 -> <clinit>
@@ -16203,7 +16210,7 @@
     2:2:java.lang.Object[] copy(java.lang.Object[],int,int,java.lang.Object[]):95:95 -> a
     1:1:java.util.LinkedHashMap com.android.tools.r8.com.google.common.collect.Maps.newLinkedHashMap():292:292 -> b
     1:1:java.util.Map preservesInsertionOrderOnPutsMap():66 -> b
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.cS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.SR:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> e
     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>
@@ -16217,7 +16224,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():46:46 -> j
     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.gS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.WR:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> k
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] valueTable -> g
@@ -16295,7 +16302,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():67:67 -> u
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():186 -> u
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():188:189 -> u
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.fS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.VR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> f
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):192:192 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):192:192 -> <init>
@@ -16324,7 +16331,7 @@
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.size():178:178 -> size
     3:3:int size():196 -> size
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():201:201 -> u
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.eS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.UR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):236:236 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():254:254 -> f
@@ -16335,7 +16342,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet.iterator():254:254 -> iterator
     1:1:java.util.Iterator iterator():236 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():239:239 -> k
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.dS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.TR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):264:264 -> <init>
     1:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):267:268 -> get
@@ -16344,7 +16351,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):268 -> get
     3:3:java.lang.Object get(int):264 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():273:273 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.hS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.XR:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> e
     1:1:void <clinit>():32:32 -> <clinit>
@@ -16366,7 +16373,7 @@
     1:1:java.util.ListIterator listIterator(int):29:29 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():88:88 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.kS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.aS:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> i
     java.util.Map$Entry[] entries -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> g
@@ -16418,7 +16425,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():257:257 -> m
     boolean isPartialView() -> o
     1:1:int size():191:191 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.iS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.YR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):213:214 -> <init>
     1:1:boolean contains(java.lang.Object):224:224 -> contains
@@ -16430,7 +16437,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableMap.size():191:191 -> size
     3:3:int size():234 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.jS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.ZR:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):264:265 -> <init>
     boolean isPartialView() -> e
@@ -16441,7 +16448,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableMap.size():191:191 -> size
     3:3:int size():275 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.mS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.cS:
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet -> j
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] entries -> f
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> g
@@ -16471,11 +16478,11 @@
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):188:188 -> h
     1:1:int hashCode():193:193 -> hashCode
     1:1:int size():177:177 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.lS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.bS:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> d
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):142:143 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():148:148 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.nS:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.dS:
     java.lang.Object[] elements -> e
     int hashCode -> h
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> i
@@ -16502,7 +16509,7 @@
     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.oU:
+com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.eU:
     1:1:java.util.HashSet newHashSetWithExpectedSize(int):255:255 -> a
     2:2:java.util.Set newConcurrentHashSet():269:269 -> a
     3:6:com.android.tools.r8.com.google.common.collect.Sets$SetView difference(java.util.Set,java.util.Set):859:862 -> a
@@ -16539,7 +16546,7 @@
     1:1:java.util.Set newIdentityHashSet():423 -> c
     2:2:java.util.Set newIdentityHashSet():423:423 -> c
     1:1:java.util.LinkedHashSet newLinkedHashSet():305:305 -> d
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.fU:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.VT:
     java.util.Set val$set2 -> c
     java.util.Set val$set1 -> b
     1:1:void <init>(java.util.Set,java.util.Set):791:791 -> <init>
@@ -16551,12 +16558,12 @@
     1:1:java.util.stream.Stream parallelStream():817:817 -> parallelStream
     1:2:int size():823:824 -> size
     1:1:java.util.stream.Stream stream():812:812 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.eU:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.UT:
     java.util.Iterator itr -> d
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):794:795 -> <init>
     1:7:java.lang.Object computeNext():799:805 -> j
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.hU:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.XT:
     java.util.Set val$set2 -> c
     java.util.Set val$set1 -> b
     1:1:void <init>(java.util.Set,java.util.Set):862:862 -> <init>
@@ -16569,12 +16576,12 @@
     1:1:java.util.stream.Stream parallelStream():888:888 -> parallelStream
     1:2:int size():894:895 -> size
     1:1:java.util.stream.Stream stream():883:883 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.gU:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.WT:
     java.util.Iterator itr -> d
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):865:866 -> <init>
     1:7:java.lang.Object computeNext():870:876 -> j
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.lU:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.bU:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> c
     int val$size -> b
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1618:1618 -> <init>
@@ -16582,32 +16589,32 @@
     1:1:java.util.Iterator iterator():1630:1630 -> iterator
     1:1:int size():1697:1697 -> size
     1:1:java.lang.String toString():1702:1702 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.kU:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.aU:
     java.util.BitSet bits -> d
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1630:1631 -> <init>
     1:29:java.util.Set com.android.tools.r8.com.google.common.collect.Sets$5$1.computeNext():1635:1663 -> j
     1:29:java.lang.Object computeNext():1630 -> j
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.jU:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.ZT:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> c
     java.util.BitSet val$copy -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1663:1663 -> <init>
     1:2:boolean contains(java.lang.Object):1666:1667 -> contains
     1:1:java.util.Iterator iterator():1672:1672 -> iterator
     1:1:int size():1688:1688 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.iU:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.YT:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> e
     int i -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1672:1673 -> <init>
     1:5:java.lang.Object computeNext():1677:1681 -> j
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.mU:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.cU:
     1:1:void <init>():76:76 -> <init>
     1:1:boolean removeAll(java.util.Collection):79:79 -> removeAll
     1:1:boolean retainAll(java.util.Collection):84:84 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> retainAll
     2:2:boolean retainAll(java.util.Collection):84 -> retainAll
     3:3:boolean retainAll(java.util.Collection):84:84 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.nU:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.dU:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):549:549 -> <init>
     2:2:void <init>():550:550 -> <init>
     1:1:boolean add(java.lang.Object):589:589 -> add
@@ -16617,7 +16624,7 @@
     1:1:boolean removeAll(java.util.Collection):628:628 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):641:641 -> removeIf
     1:1:boolean retainAll(java.util.Collection):654:654 -> retainAll
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.bV:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.RU:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap lazyInverse -> i
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> h
     java.lang.Object singleKey -> f
@@ -16642,7 +16649,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():91 -> l
     boolean isPartialView() -> o
     1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():99:105 -> u
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.cV:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.SU:
     java.lang.Object element -> d
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> e
@@ -16657,7 +16664,7 @@
     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.dV:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.TU:
     java.lang.Object element -> e
     int cachedHashCode -> f
     1:2:void <init>(java.lang.Object):43:44 -> <init>
@@ -16673,7 +16680,7 @@
     1:3:int hashCode():87:89 -> hashCode
     1:1:boolean isHashCodeFast():96:96 -> i
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.zW:
+com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.pW:
     java.util.Spliterator lambda$concat$0(java.util.Spliterator) -> a
     1:3:java.util.stream.Stream stream(java.lang.Iterable):62:64 -> a
     4:15:java.util.stream.Stream concat(java.util.stream.Stream[]):162:173 -> a
@@ -16697,27 +16704,27 @@
     68:116:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):423:471 -> a
     1:3:void com.android.tools.r8.com.google.common.collect.Streams.closeAll(java.util.stream.BaseStream[]):141:143 -> b
     1:3:void lambda$concat$1(java.util.stream.Stream[]):178 -> b
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.uW:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.kW:
     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):319:319 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):322:323 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.vW:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.lW:
     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):444:445 -> <init>
     1:1:void accept(java.lang.Object):450:450 -> accept
     1:7:boolean tryAdvance(java.util.function.Consumer):455:461 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.wW:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.mW:
     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):426:427 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):431:432 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.xW:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.nW:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.yW:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.oW:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):732:734 -> <init>
@@ -16731,17 +16738,17 @@
     6:6:java.util.Spliterator trySplit():726 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():747:747 -> trySplit
     7:7:java.util.Spliterator trySplit():726 -> trySplit
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.RY:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.HY:
     java.util.Iterator backingIterator -> b
     1:2:void <init>(java.util.Iterator):34:35 -> <init>
     java.lang.Object transform(java.lang.Object) -> a
     1:1:boolean hasNext():42:42 -> hasNext
     1:1:java.lang.Object next():47:47 -> next
     1:1:void remove():52:52 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.L00:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.B00:
     1:1:void <init>():36:36 -> <init>
     1:1:void remove():48:48 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.M00:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.C00:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):45:45 -> add
     1:1:void set(java.lang.Object):58:58 -> set
@@ -16796,7 +16803,7 @@
     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.Am:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.vm:
     char[] hexDigits -> b
     int $r8$clinit -> c
     1:1:void <clinit>():420:420 -> <clinit>
@@ -16825,7 +16832,7 @@
     2:2:byte[] com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.getBytesInternal():304:304 -> toString
     2:2:java.lang.String toString():412 -> toString
     3:7:java.lang.String toString():413:417 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.zm:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.um:
     byte[] bytes -> d
     1:2:void <init>(byte[]):253:254 -> <init>
     1:1:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):311:311 -> a
@@ -16836,10 +16843,10 @@
     10:10:byte[] com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.getBytesInternal():304:304 -> a
     10:10:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):317 -> a
     11:11:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):317:317 -> a
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.Dm:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.ym:
     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.Fm:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.Am:
     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
@@ -16849,16 +16856,16 @@
     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.Jm:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.Em:
 # {"id":"sourceFile","fileName":"Hashing.java"}
     int GOOD_FAST_HASH_SEED -> a
     1:1:void <clinit>():91:91 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_128():134:134 -> a
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():201:201 -> b
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.Im:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.Dm:
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
     1:1:void <clinit>():205:205 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.gE:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.ZD:
     java.security.MessageDigest prototype -> b
     int bytes -> c
     java.lang.String toString -> e
@@ -16868,7 +16875,7 @@
     2:4:java.security.MessageDigest getMessageDigest(java.lang.String):82:84 -> a
     5:12:com.android.tools.r8.com.google.common.hash.Hasher newHasher():90:97 -> a
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.fE:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.YD:
     java.security.MessageDigest digest -> b
     int bytes -> c
     boolean done -> d
@@ -16888,7 +16895,7 @@
     3:3:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.checkNotDone():152:152 -> b
     3:3:void update(byte[],int,int):141 -> b
     4:4:void update(byte[],int,int):142:142 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.eG:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.XF:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_128 -> c
     int seed -> b
     1:3:void <clinit>():45:47 -> <clinit>
@@ -16897,7 +16904,7 @@
     1:3:boolean equals(java.lang.Object):74:76 -> equals
     1:1:int hashCode():83:83 -> hashCode
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.dG:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.WF:
     long h2 -> e
     int length -> f
     long h1 -> d
@@ -17115,7 +17122,7 @@
     185:185:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():187 -> a
     185:185:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.r4:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.q4:
     com.android.tools.r8.com.google.common.io.BaseEncoding BASE64_URL -> a
     1:45:void <clinit>():320:364 -> <clinit>
     46:46:void com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding.<init>(java.lang.String,java.lang.String,java.lang.Character):571:571 -> <clinit>
@@ -17138,7 +17145,7 @@
     12:12:java.lang.String encode(byte[]):148 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding base64Url():360:360 -> 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.n4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.m4:
     char[] chars -> b
     int bytesPerChunk -> f
     byte[] decodabet -> g
@@ -17155,19 +17162,19 @@
     1:3:boolean equals(java.lang.Object):551:553 -> equals
     1:1:int hashCode():560:560 -> hashCode
     1:1:java.lang.String toString():546:546 -> toString
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.o4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.n4:
     char[] encoding -> d
     1:1:void <init>(java.lang.String,java.lang.String):893:893 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):897:897 -> <init>
     3:14:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):890:901 -> <init>
     1:6:void encodeTo(java.lang.Appendable,byte[],int,int):907:912 -> a
     7:7:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):932:932 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.p4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.o4:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.Character):938:938 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):942:943 -> <init>
     1:12:void encodeTo(java.lang.Appendable,byte[],int,int):948:959 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):989:989 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.q4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.p4:
     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):574:577 -> <init>
@@ -17182,7 +17189,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):77:77 -> hashCode
     2:2:int hashCode():885 -> hashCode
     1:10:java.lang.String toString():861:870 -> toString
-com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.a6:
     int $r8$clinit -> a
     1:1:void <clinit>():640:640 -> <clinit>
     1:1:byte[] toByteArray(java.io.InputStream):220:220 -> a
@@ -17204,7 +17211,7 @@
     19:25:byte[] toByteArray(java.io.InputStream):221 -> a
     26:26:byte[] com.android.tools.r8.com.google.common.io.ByteStreams.toByteArrayInternal(java.io.InputStream,java.util.Queue,int):195:195 -> a
     26:26:byte[] toByteArray(java.io.InputStream):221 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.Z5:
     1:1:void <init>():641:641 -> <init>
     1:1:java.lang.String toString():660:660 -> toString
     1:1:void write(byte[]):649:649 -> write
@@ -17213,7 +17220,7 @@
     3:3:void write(byte[],int,int):655:655 -> write
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> write
     4:4:void write(byte[],int,int):655 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.e9:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.d9:
     java.lang.CharSequence seq -> b
     int mark -> d
     int pos -> c
@@ -17254,11 +17261,11 @@
     4:5:long skip(long):97:98 -> skip
     6:6:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):205:205 -> skip
     6:6:long skip(long):95 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.g9:
     1:1:void <init>():75:75 -> <init>
     java.io.Reader openStream() -> a
     1:3:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):480:482 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.e9:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():524:524 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):528:529 -> <init>
@@ -17272,10 +17279,10 @@
     4:16:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):563:575 -> toString
     4:16:java.lang.String toString():608 -> toString
     17:17:java.lang.String toString():608:608 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.f9:
     1:1:void <init>(java.lang.String):629:629 -> <init>
     1:1:java.io.Reader openStream():634:634 -> a
-com.android.tools.r8.com.google.common.io.CharStreams -> com.android.tools.r8.internal.i9:
+com.android.tools.r8.com.google.common.io.CharStreams -> com.android.tools.r8.internal.h9:
     1:2:java.lang.StringBuilder com.android.tools.r8.com.google.common.io.CharStreams.toStringBuilder(java.lang.Readable):176:177 -> a
     1:2:java.lang.String toString(java.lang.Readable):164 -> a
     3:3:long com.android.tools.r8.com.google.common.io.CharStreams.copyReaderToBuilder(java.io.Reader,java.lang.StringBuilder):115:115 -> a
@@ -17327,10 +17334,10 @@
     24:24:java.lang.StringBuilder com.android.tools.r8.com.google.common.io.CharStreams.toStringBuilder(java.lang.Readable):180 -> a
     24:24:java.lang.String toString(java.lang.Readable):164 -> a
     25:25:java.lang.String toString(java.lang.Readable):164:164 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.nb:
     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.sb:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.rb:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> b
     java.util.Deque stack -> c
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> d
@@ -17363,12 +17370,12 @@
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):104 -> close
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):184 -> close
     25:25:void close():224 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.ob:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():244:244 -> <clinit>
     1:1:void <init>():242:242 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):249:249 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.qb:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.pb:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():261:261 -> <clinit>
@@ -17379,9 +17386,9 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):284:284 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):249:249 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):287 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.rb:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.qb:
     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.rt:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.kt:
     int[] biggestBinomials -> a
     1:1:void <clinit>():676:676 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -17413,27 +17420,27 @@
     31:31:int checkedAdd(int,int):456:456 -> b
     32:32:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkNoOverflow(boolean,java.lang.String,int,int):95:95 -> b
     32:32:int checkedAdd(int,int):456 -> b
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.qt:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.jt:
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():120:120 -> <clinit>
-com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.ND:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.GD:
     1:1:int checkNonNegative(java.lang.String,int):54:54 -> a
-com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.nu:
+com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.gu:
     int saturatedCast(long) -> a
-com.android.tools.r8.com.google.gson.ExclusionStrategy -> com.android.tools.r8.internal.kj:
+com.android.tools.r8.com.google.gson.ExclusionStrategy -> com.android.tools.r8.internal.fj:
     boolean shouldSkipClass(java.lang.Class) -> a
     boolean shouldSkipField(com.android.tools.r8.com.google.gson.FieldAttributes) -> b
-com.android.tools.r8.com.google.gson.FieldNamingPolicy -> com.android.tools.r8.internal.Rj:
+com.android.tools.r8.com.google.gson.FieldNamingPolicy -> com.android.tools.r8.internal.Mj:
     com.android.tools.r8.com.google.gson.FieldNamingPolicy IDENTITY -> b
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.gson.FieldNamingPolicy$1):31:31 -> <init>
-com.android.tools.r8.com.google.gson.FieldNamingPolicy$1 -> com.android.tools.r8.internal.Qj:
+com.android.tools.r8.com.google.gson.FieldNamingPolicy$1 -> com.android.tools.r8.internal.Lj:
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
     1:1:java.lang.String translateName(java.lang.reflect.Field):39:39 -> a
-com.android.tools.r8.com.google.gson.FieldNamingStrategy -> com.android.tools.r8.internal.Sj:
+com.android.tools.r8.com.google.gson.FieldNamingStrategy -> com.android.tools.r8.internal.Nj:
     java.lang.String translateName(java.lang.reflect.Field) -> a
-com.android.tools.r8.com.google.gson.Gson -> com.android.tools.r8.internal.jm:
+com.android.tools.r8.com.google.gson.Gson -> com.android.tools.r8.internal.em:
     com.android.tools.r8.com.google.gson.reflect.TypeToken NULL_KEY_SURROGATE -> j
     java.util.Map typeTokenCache -> b
     java.lang.ThreadLocal calls -> a
@@ -17466,9 +17473,9 @@
     3:3:com.android.tools.r8.com.google.gson.TypeAdapter atomicLongArrayAdapter(com.android.tools.r8.com.google.gson.TypeAdapter):388 -> b
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter longAdapter(com.android.tools.r8.com.google.gson.LongSerializationPolicy):332:332 -> c
     1:6:java.lang.String toString():982:987 -> toString
-com.android.tools.r8.com.google.gson.Gson$1 -> com.android.tools.r8.internal.dm:
+com.android.tools.r8.com.google.gson.Gson$1 -> com.android.tools.r8.internal.Yl:
     1:1:void <init>():112:112 -> <init>
-com.android.tools.r8.com.google.gson.Gson$2 -> com.android.tools.r8.internal.em:
+com.android.tools.r8.com.google.gson.Gson$2 -> com.android.tools.r8.internal.Zl:
     1:1:void <init>(com.android.tools.r8.com.google.gson.Gson):278:278 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):278:278 -> a
     2:5:void com.android.tools.r8.com.google.gson.Gson$2.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):288:291 -> a
@@ -17483,7 +17490,7 @@
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):278 -> a
     9:13:java.lang.Double com.android.tools.r8.com.google.gson.Gson$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):280:284 -> a
     9:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):278 -> a
-com.android.tools.r8.com.google.gson.Gson$3 -> com.android.tools.r8.internal.fm:
+com.android.tools.r8.com.google.gson.Gson$3 -> com.android.tools.r8.internal.am:
     1:1:void <init>(com.android.tools.r8.com.google.gson.Gson):302:302 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):302:302 -> a
     2:5:void com.android.tools.r8.com.google.gson.Gson$3.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):312:315 -> a
@@ -17498,7 +17505,7 @@
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):302 -> a
     9:13:java.lang.Float com.android.tools.r8.com.google.gson.Gson$3.read(com.android.tools.r8.com.google.gson.stream.JsonReader):304:308 -> a
     9:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):302 -> a
-com.android.tools.r8.com.google.gson.Gson$5 -> com.android.tools.r8.internal.gm:
+com.android.tools.r8.com.google.gson.Gson$5 -> com.android.tools.r8.internal.bm:
     com.android.tools.r8.com.google.gson.TypeAdapter val$longAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):353:353 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):353:353 -> a
@@ -17506,7 +17513,7 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):353 -> a
     3:4:java.util.concurrent.atomic.AtomicLong com.android.tools.r8.com.google.gson.Gson$5.read(com.android.tools.r8.com.google.gson.stream.JsonReader):358:359 -> a
     3:4:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):353 -> a
-com.android.tools.r8.com.google.gson.Gson$6 -> com.android.tools.r8.internal.hm:
+com.android.tools.r8.com.google.gson.Gson$6 -> com.android.tools.r8.internal.cm:
     com.android.tools.r8.com.google.gson.TypeAdapter val$longAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):365:365 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):365:365 -> a
@@ -17514,7 +17521,7 @@
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):365 -> a
     7:17:java.util.concurrent.atomic.AtomicLongArray com.android.tools.r8.com.google.gson.Gson$6.read(com.android.tools.r8.com.google.gson.stream.JsonReader):374:384 -> a
     7:17:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):365 -> a
-com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter -> com.android.tools.r8.internal.im:
+com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter -> com.android.tools.r8.internal.dm:
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> a
     1:1:void <init>():955:955 -> <init>
     1:4:void setDelegate(com.android.tools.r8.com.google.gson.TypeAdapter):959:962 -> a
@@ -17523,9 +17530,9 @@
     10:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):967:967 -> a
     11:14:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):973:976 -> a
     15:15:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):974:974 -> a
-com.android.tools.r8.com.google.gson.InstanceCreator -> com.android.tools.r8.internal.Np:
+com.android.tools.r8.com.google.gson.InstanceCreator -> com.android.tools.r8.internal.Gp:
     java.lang.Object createInstance(java.lang.reflect.Type) -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.Bv:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.uv:
     java.util.List elements -> b
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.String):85:85 -> a
@@ -17539,7 +17546,7 @@
     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.Cv:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.vv:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -17555,16 +17562,16 @@
     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.Dv:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.wv:
     1:1:void <init>(java.lang.String):29:29 -> <init>
     2:2:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.Ev:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.xv:
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> b
     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.Fv:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.yv:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> b
     1:2:void <init>():32:33 -> <init>
     1:1:void addProperty(java.lang.String,java.lang.Boolean):0:0 -> a
@@ -17588,11 +17595,11 @@
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject(java.lang.String):191:191 -> g
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.Gv:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.zv:
     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.Hv:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.Av:
     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
@@ -17620,7 +17627,7 @@
     43:43:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):84 -> a
     44:44:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     45:49: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.Iv:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.Bv:
     java.lang.Class[] PRIMITIVE_TYPES -> c
     java.lang.Object value -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -17658,24 +17665,24 @@
     1:13:int hashCode():289:301 -> hashCode
     1:1:boolean isNumber():146:146 -> i
     1:1:boolean isString():166:166 -> j
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.Mv:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.Fv:
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):34:34 -> <init>
     3:3:void <init>(java.lang.Throwable):45:45 -> <init>
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.gZ:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.WY:
     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
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter nullSafe():186:186 -> a
-com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.fZ:
+com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.VY:
     com.android.tools.r8.com.google.gson.TypeAdapter this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):186:186 -> <init>
     1:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):189:191 -> a
     4:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):195:199 -> a
-com.android.tools.r8.com.google.gson.TypeAdapterFactory -> com.android.tools.r8.internal.hZ:
+com.android.tools.r8.com.google.gson.TypeAdapterFactory -> com.android.tools.r8.internal.XY:
     com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken) -> a
-com.android.tools.r8.com.google.gson.annotations.JsonAdapter -> com.android.tools.r8.internal.zv:
-com.android.tools.r8.com.google.gson.annotations.SerializedName -> com.android.tools.r8.internal.aU:
+com.android.tools.r8.com.google.gson.annotations.JsonAdapter -> com.android.tools.r8.internal.sv:
+com.android.tools.r8.com.google.gson.annotations.SerializedName -> com.android.tools.r8.internal.QT:
 com.android.tools.r8.com.google.gson.internal.$Gson$Preconditions -> com.android.tools.r8.internal.a:
 # {"id":"sourceFile","fileName":"$Gson$Preconditions.java"}
     1:1:java.lang.Object checkNotNull(java.lang.Object):39:39 -> a
@@ -17773,12 +17780,12 @@
     1168:1168:java.lang.String toString():578:578 -> toString
     580:582:java.lang.String toString():578:580 -> toString
     583:583:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1172,"2":1173,"3":1174}}
-    1172:1172:java.lang.String toString():582:582 -> toString
-    1173:1173:java.lang.String toString():582:582 -> toString
-    1174:1174:java.lang.String toString():582:582 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1166,"2":1167,"3":1168}}
+    1166:1166:java.lang.String toString():582:582 -> toString
+    1167:1167:java.lang.String toString():582:582 -> toString
+    1168:1168:java.lang.String toString():582:582 -> toString
     1165:1165:java.lang.String toString():582:582 -> toString
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor -> com.android.tools.r8.internal.Od:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor -> com.android.tools.r8.internal.Nd:
     java.util.Map instanceCreators -> a
     1:2:void <init>(java.util.Map):51:52 -> <init>
     1:21:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):56:76 -> a
@@ -17791,24 +17798,24 @@
     101:101:com.android.tools.r8.com.google.gson.internal.ObjectConstructor com.android.tools.r8.com.google.gson.internal.ConstructorConstructor.newUnsafeAllocator(java.lang.reflect.Type,java.lang.Class):218:218 -> a
     101:101:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):94 -> a
     1:1:java.lang.String toString():234:234 -> toString
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$1 -> com.android.tools.r8.internal.Fd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$1 -> com.android.tools.r8.internal.Ed:
     com.android.tools.r8.com.google.gson.InstanceCreator val$typeCreator -> a
     java.lang.reflect.Type val$type -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.InstanceCreator,java.lang.reflect.Type):64:64 -> <init>
     1:1:java.lang.Object construct():66:66 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$10 -> com.android.tools.r8.internal.Ad:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$10 -> com.android.tools.r8.internal.zd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):186:186 -> <init>
     1:1:java.lang.Object construct():188:188 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$11 -> com.android.tools.r8.internal.Bd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$11 -> com.android.tools.r8.internal.Ad:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):192:192 -> <init>
     1:1:java.lang.Object construct():194:194 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$12 -> com.android.tools.r8.internal.Cd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$12 -> com.android.tools.r8.internal.Bd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):199:199 -> <init>
     1:1:java.lang.Object construct():201:201 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$13 -> com.android.tools.r8.internal.Dd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$13 -> com.android.tools.r8.internal.Cd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):205:205 -> <init>
     1:1:java.lang.Object construct():207:207 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$14 -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$14 -> com.android.tools.r8.internal.Dd:
     com.android.tools.r8.com.google.gson.internal.UnsafeAllocator unsafeAllocator -> a
     java.lang.reflect.Type val$type -> c
     java.lang.Class val$rawType -> b
@@ -17820,33 +17827,33 @@
     233:233:java.lang.Object construct():226:226 -> a
     234:234:java.lang.Object construct():226:226 -> a
     231:231:java.lang.Object construct():226:226 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$2 -> com.android.tools.r8.internal.Gd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$2 -> com.android.tools.r8.internal.Fd:
     com.android.tools.r8.com.google.gson.InstanceCreator val$rawTypeCreator -> a
     java.lang.reflect.Type val$type -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.InstanceCreator,java.lang.reflect.Type):76:76 -> <init>
     1:1:java.lang.Object construct():78:78 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$3 -> com.android.tools.r8.internal.Hd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$3 -> com.android.tools.r8.internal.Gd:
     java.lang.reflect.Constructor val$constructor -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,java.lang.reflect.Constructor):103:103 -> <init>
     1:11:java.lang.Object construct():108:118 -> a
     12:12:java.lang.Object construct():115:115 -> a
     13:13:java.lang.Object construct():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":246,"2":247,"3":248}}
-    246:246:java.lang.Object construct():115:115 -> a
-    247:247:java.lang.Object construct():115:115 -> a
-    248:248:java.lang.Object construct():115:115 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":243,"2":244,"3":245}}
+    243:243:java.lang.Object construct():115:115 -> a
+    244:244:java.lang.Object construct():115:115 -> a
+    245:245:java.lang.Object construct():115:115 -> a
     128:129:java.lang.Object construct():115:116 -> a
     130:130:java.lang.Object construct():111:111 -> a
     131:131:java.lang.Object construct():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":249,"2":250,"3":251}}
-    249:249:java.lang.Object construct():111:111 -> a
-    250:250:java.lang.Object construct():111:111 -> a
-    251:251:java.lang.Object construct():111:111 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":243,"2":244,"3":245}}
+    243:243:java.lang.Object construct():111:111 -> a
+    244:244:java.lang.Object construct():111:111 -> a
+    245:245:java.lang.Object construct():111:111 -> a
     242:242:java.lang.Object construct():111:111 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$4 -> com.android.tools.r8.internal.Id:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$4 -> com.android.tools.r8.internal.Hd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):136:136 -> <init>
     1:1:java.lang.Object construct():138:138 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$5 -> com.android.tools.r8.internal.Jd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$5 -> com.android.tools.r8.internal.Id:
     java.lang.reflect.Type val$type -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,java.lang.reflect.Type):142:142 -> <init>
     1:6:java.lang.Object construct():145:150 -> a
@@ -17857,24 +17864,24 @@
     317:317:java.lang.Object construct():150:150 -> a
     157:160:java.lang.Object construct():150:153 -> a
     161:161:java.lang.Object construct():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":320,"2":321,"3":322}}
-    320:320:java.lang.Object construct():153:153 -> a
-    321:321:java.lang.Object construct():153:153 -> a
-    322:322:java.lang.Object construct():153:153 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":315,"2":316,"3":317}}
+    315:315:java.lang.Object construct():153:153 -> a
+    316:316:java.lang.Object construct():153:153 -> a
+    317:317:java.lang.Object construct():153:153 -> a
     314:314:java.lang.Object construct():153:153 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$6 -> com.android.tools.r8.internal.Kd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$6 -> com.android.tools.r8.internal.Jd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):158:158 -> <init>
     1:1:java.lang.Object construct():160:160 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$7 -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$7 -> com.android.tools.r8.internal.Kd:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):164:164 -> <init>
     1:1:java.lang.Object construct():166:166 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$8 -> com.android.tools.r8.internal.Md:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$8 -> com.android.tools.r8.internal.Ld:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):170:170 -> <init>
     1:1:java.lang.Object construct():172:172 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$9 -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$9 -> com.android.tools.r8.internal.Md:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):180:180 -> <init>
     1:1:java.lang.Object construct():182:182 -> a
-com.android.tools.r8.com.google.gson.internal.Excluder -> com.android.tools.r8.internal.jj:
+com.android.tools.r8.com.google.gson.internal.Excluder -> com.android.tools.r8.internal.ej:
     java.util.List serializationStrategies -> b
     java.util.List deserializationStrategies -> c
     com.android.tools.r8.com.google.gson.internal.Excluder DEFAULT -> d
@@ -17893,7 +17900,7 @@
     44:46:boolean excludeClass(java.lang.Class,boolean):205:207 -> a
     1:3:com.android.tools.r8.com.google.gson.internal.Excluder com.android.tools.r8.com.google.gson.internal.Excluder.clone():63:65 -> clone
     1:3:java.lang.Object clone():50 -> clone
-com.android.tools.r8.com.google.gson.internal.Excluder$1 -> com.android.tools.r8.internal.ij:
+com.android.tools.r8.com.google.gson.internal.Excluder$1 -> com.android.tools.r8.internal.dj:
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> a
     com.android.tools.r8.com.google.gson.reflect.TypeToken val$type -> e
     com.android.tools.r8.com.google.gson.internal.Excluder this$0 -> f
@@ -17909,11 +17916,11 @@
     10:13:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.internal.Excluder$1.delegate():141:144 -> a
     10:13:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):137 -> a
     14:14:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):137:137 -> a
-com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess -> com.android.tools.r8.internal.Lv:
+com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess -> com.android.tools.r8.internal.Ev:
     com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess INSTANCE -> a
     1:1:void <init>():25:25 -> <init>
     void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.QA:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.JA:
     java.lang.String value -> b
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -17923,7 +17930,7 @@
     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.bC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.UB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> f
     boolean $assertionsDisabled -> j
@@ -17968,12 +17975,12 @@
     2:2:java.lang.Object remove(java.lang.Object):111 -> remove
     3:3: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.UB:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.NB:
     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.WB:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.PB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):560:560 -> <init>
     1:1:void clear():591:591 -> clear
@@ -18002,7 +18009,7 @@
     9:9:boolean remove(java.lang.Object):582 -> remove
     10:10:boolean remove(java.lang.Object):586: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.VB:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.OB:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():539:547 -> next
     1:9:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568 -> next
@@ -18013,7 +18020,7 @@
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():541:541 -> next
     11:11:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568 -> next
     11:11:java.lang.Object next():566 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.RB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):595:595 -> <init>
     1:1:void clear():617:617 -> clear
@@ -18026,7 +18033,7 @@
     3:3:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):279:279 -> remove
     3:3: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.XB:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.QB:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):601:601 -> <init>
     1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():539:547 -> next
     1:9:java.lang.Object next():603 -> next
@@ -18035,7 +18042,7 @@
     11:11:java.lang.Object next():603 -> next
     12:12:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():541:541 -> next
     12:12:java.lang.Object next():603 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.ZB:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.SB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> e
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> b
@@ -18045,7 +18052,7 @@
     1:1:boolean hasNext():535:535 -> hasNext
     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.aC:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.TB:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node left -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> f
@@ -18062,9 +18069,9 @@
     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.ObjectConstructor -> com.android.tools.r8.internal.PJ:
+com.android.tools.r8.com.google.gson.internal.ObjectConstructor -> com.android.tools.r8.internal.FJ:
     java.lang.Object construct() -> a
-com.android.tools.r8.com.google.gson.internal.Primitives -> com.android.tools.r8.internal.GM:
+com.android.tools.r8.com.google.gson.internal.Primitives -> com.android.tools.r8.internal.wM:
     java.util.Map PRIMITIVE_TO_WRAPPER_TYPE -> a
     1:4:void <clinit>():45:48 -> <clinit>
     5:6:void com.android.tools.r8.com.google.gson.internal.Primitives.add(java.util.Map,java.util.Map,java.lang.Class,java.lang.Class):64:65 -> <clinit>
@@ -18095,7 +18102,7 @@
     29:30:void <clinit>():56 -> <clinit>
     31:32:void <clinit>():58:59 -> <clinit>
     1:1:boolean isPrimitive(java.lang.reflect.Type):72:72 -> a
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator -> com.android.tools.r8.internal.T00:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator -> com.android.tools.r8.internal.J00:
     1:1:void <init>():31:31 -> <init>
     1:62:com.android.tools.r8.com.google.gson.internal.UnsafeAllocator create():40:101 -> a
     63:68:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):115:120 -> a
@@ -18123,24 +18130,24 @@
     73:73:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):117:117 -> a
     73:73:void access$000(java.lang.Class):31 -> a
     java.lang.Object newInstance(java.lang.Class) -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$1 -> com.android.tools.r8.internal.P00:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$1 -> com.android.tools.r8.internal.F00:
     java.lang.Object val$unsafe -> b
     java.lang.reflect.Method val$allocateInstance -> a
     1:1:void <init>(java.lang.reflect.Method,java.lang.Object):45:45 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):49:50 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$2 -> com.android.tools.r8.internal.Q00:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$2 -> com.android.tools.r8.internal.G00:
     int val$constructorId -> b
     java.lang.reflect.Method val$newInstance -> a
     1:1:void <init>(java.lang.reflect.Method,int):69:69 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):73:74 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$3 -> com.android.tools.r8.internal.R00:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$3 -> com.android.tools.r8.internal.H00:
     java.lang.reflect.Method val$newInstance -> a
     1:1:void <init>(java.lang.reflect.Method):89:89 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):93:94 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$4 -> com.android.tools.r8.internal.S00:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$4 -> com.android.tools.r8.internal.I00:
     1:1:void <init>():101:101 -> <init>
     1:1:java.lang.Object newInstance(java.lang.Class):104:104 -> b
-com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter -> com.android.tools.r8.internal.p3:
+com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter -> com.android.tools.r8.internal.o3:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> c
     com.android.tools.r8.com.google.gson.TypeAdapter componentTypeAdapter -> b
     java.lang.Class componentType -> a
@@ -18148,17 +18155,17 @@
     1:4:void <init>(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.TypeAdapter,java.lang.Class):57:60 -> <init>
     1:15:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):64:78 -> a
     16:25:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):86:95 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter$1 -> com.android.tools.r8.internal.o3:
+com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter$1 -> com.android.tools.r8.internal.n3:
     1:1:void <init>():39:39 -> <init>
     1:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):42:43 -> a
     3:5:java.lang.reflect.Type com.android.tools.r8.com.google.gson.internal.$Gson$Types.getArrayComponentType(java.lang.reflect.Type):280:282 -> a
     3:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):47 -> a
     6:8:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):48:50 -> a
-com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory -> com.android.tools.r8.internal.Zb:
+com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory -> com.android.tools.r8.internal.Yb:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):39:40 -> <init>
     1:13:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45:57 -> a
-com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.Yb:
+com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.Xb:
     com.android.tools.r8.com.google.gson.TypeAdapter elementTypeAdapter -> a
     com.android.tools.r8.com.google.gson.internal.ObjectConstructor constructor -> b
     1:4:void <init>(com.android.tools.r8.com.google.gson.Gson,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.internal.ObjectConstructor):67:70 -> <init>
@@ -18167,7 +18174,7 @@
     2:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):61 -> a
     11:22:java.util.Collection com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):74:85 -> a
     11:22:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):61 -> a
-com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter -> com.android.tools.r8.internal.se:
+com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter -> com.android.tools.r8.internal.re:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> c
     java.text.DateFormat localFormat -> b
     java.text.DateFormat enUsFormat -> a
@@ -18184,16 +18191,16 @@
     31:31:java.util.Date com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter.deserializeToDate(java.lang.String):74:74 -> a
     31:31:java.util.Date com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):59 -> a
     31:31:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):41 -> a
-com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter$1 -> com.android.tools.r8.internal.re:
+com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter$1 -> com.android.tools.r8.internal.qe:
     1:1:void <init>():42:42 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45:45 -> a
-com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory -> com.android.tools.r8.internal.Av:
+com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory -> com.android.tools.r8.internal.tv:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):37:38 -> <init>
     1:6:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44:49 -> a
     7:29:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):55:77 -> a
     30:30:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):71:71 -> a
-com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter -> com.android.tools.r8.internal.Pv:
+com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter -> com.android.tools.r8.internal.Iv:
     java.io.Writer UNWRITABLE_WRITER -> p
     com.android.tools.r8.com.google.gson.JsonPrimitive SENTINEL_CLOSED -> q
     java.lang.String pendingName -> n
@@ -18251,12 +18258,12 @@
     74:74:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> m
     75:75:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> m
     72:72:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> m
-com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter$1 -> com.android.tools.r8.internal.Ov:
+com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter$1 -> com.android.tools.r8.internal.Hv:
     1:1:void <init>():34:34 -> <init>
     1:1:void close():42:42 -> close
     1:1:void flush():39:39 -> flush
     1:1:void write(char[],int,int):36:36 -> write
-com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory -> com.android.tools.r8.internal.rD:
+com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory -> com.android.tools.r8.internal.kD:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     boolean complexMapKeySerialization -> c
     1:3:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,boolean):110:112 -> <init>
@@ -18264,7 +18271,7 @@
     11:14:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory.getKeyAdapter(com.android.tools.r8.com.google.gson.Gson,java.lang.reflect.Type):140:140 -> a
     11:14:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):125 -> a
     15:20:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):126:131 -> a
-com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.qD:
+com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.jD:
     com.android.tools.r8.com.google.gson.TypeAdapter keyTypeAdapter -> a
     com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory this$0 -> d
     com.android.tools.r8.com.google.gson.TypeAdapter valueTypeAdapter -> b
@@ -18330,7 +18337,7 @@
     62:80:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):145 -> a
     81:97:java.util.Map com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):177:193 -> a
     81:97:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):145 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter -> com.android.tools.r8.internal.mK:
+com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter -> com.android.tools.r8.internal.cK:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     com.android.tools.r8.com.google.gson.Gson gson -> a
     1:1:void <clinit>():38:38 -> <clinit>
@@ -18349,10 +18356,10 @@
     58:58:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):521:521 -> a
     58:58:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):100 -> a
     59:65:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):101:107 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1 -> com.android.tools.r8.internal.lK:
+com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1 -> com.android.tools.r8.internal.bK:
     1:1:void <init>():38:38 -> <init>
     1:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):41:42 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory -> com.android.tools.r8.internal.YR:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory -> com.android.tools.r8.internal.OR:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     com.android.tools.r8.com.google.gson.internal.Excluder excluder -> d
     com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory jsonAdapterFactory -> e
@@ -18375,7 +18382,7 @@
     61:70:java.util.Map com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory.getBoundFields(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,java.lang.Class):166:175 -> a
     61:70:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):100 -> a
     71:71:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):100:100 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1 -> com.android.tools.r8.internal.WR:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1 -> com.android.tools.r8.internal.MR:
     com.android.tools.r8.com.google.gson.reflect.TypeToken val$fieldType -> h
     boolean val$isPrimitive -> i
     java.lang.reflect.Field val$field -> d
@@ -18388,7 +18395,7 @@
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory,java.lang.String,boolean,boolean,java.lang.reflect.Field,boolean,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,boolean):118:118 -> <init>
     2:5:void com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$BoundField.<init>(java.lang.String,boolean,boolean):185:188 -> <init>
     2:5:void <init>(com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory,java.lang.String,boolean,boolean,java.lang.reflect.Field,boolean,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,boolean):118 -> <init>
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.XR:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.NR:
     java.util.Map boundFields -> b
     com.android.tools.r8.com.google.gson.internal.ObjectConstructor constructor -> a
     1:3:void <init>(com.android.tools.r8.com.google.gson.internal.ObjectConstructor,java.util.Map):199:201 -> <init>
@@ -18409,7 +18416,7 @@
     40:43:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):243 -> a
     44:44:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):249:249 -> a
     45:45:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):247:247 -> a
-com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter -> com.android.tools.r8.internal.yV:
+com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter -> com.android.tools.r8.internal.oV:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     java.text.DateFormat format -> a
     1:1:void <clinit>():39:39 -> <clinit>
@@ -18420,10 +18427,10 @@
     11:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):38:38 -> a
     12:12:void com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Date):65:65 -> a
     12:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):38 -> a
-com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter$1 -> com.android.tools.r8.internal.xV:
+com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter$1 -> com.android.tools.r8.internal.nV:
     1:1:void <init>():39:39 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):42:42 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter -> com.android.tools.r8.internal.rY:
+com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter -> com.android.tools.r8.internal.hY:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     java.text.DateFormat format -> a
     1:1:void <clinit>():41:41 -> <clinit>
@@ -18434,10 +18441,10 @@
     11:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40:40 -> a
     12:12:void com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Time):64:64 -> a
     12:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter$1 -> com.android.tools.r8.internal.qY:
+com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter$1 -> com.android.tools.r8.internal.gY:
     1:1:void <init>():41:41 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44:44 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper -> com.android.tools.r8.internal.iZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper -> com.android.tools.r8.internal.YY:
     java.lang.reflect.Type type -> c
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> b
     com.android.tools.r8.com.google.gson.Gson context -> a
@@ -18447,7 +18454,7 @@
     4:6:java.lang.reflect.Type com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper.getRuntimeTypeIfMoreSpecific(java.lang.reflect.Type,java.lang.Object):76:78 -> a
     4:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):54 -> a
     7:21:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):55:69 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.UZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.KZ:
     com.android.tools.r8.com.google.gson.TypeAdapter FLOAT -> l
     com.android.tools.r8.com.google.gson.TypeAdapterFactory URL_FACTORY -> u
     com.android.tools.r8.com.google.gson.TypeAdapterFactory STRING_BUILDER_FACTORY -> s
@@ -18548,7 +18555,7 @@
     361:398:void <clinit>():787:824 -> <clinit>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapterFactory newFactory(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):850:850 -> a
     2:2:com.android.tools.r8.com.google.gson.TypeAdapterFactory newFactory(java.lang.Class,java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):863:863 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.tZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.jZ:
     1:1:void <init>():69:69 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69:69 -> a
     2:4:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Class):73:75 -> a
@@ -18565,35 +18572,35 @@
     6:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69 -> a
     10:14:java.lang.Class com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1.read(com.android.tools.r8.com.google.gson.stream.JsonReader):81:85 -> a
     10:14:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):69 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.jZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.ZY:
     1:1:void <init>():282:282 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282:282 -> a
     2:6:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicIntegerArray):303:307 -> a
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282 -> a
     7:21:java.util.concurrent.atomic.AtomicIntegerArray com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10.read(com.android.tools.r8.com.google.gson.stream.JsonReader):284:298 -> a
     7:21:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):282 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11 -> com.android.tools.r8.internal.kZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11 -> com.android.tools.r8.internal.aZ:
     1:1:void <init>():313:313 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):313:313 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):328:328 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):313 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11.read(com.android.tools.r8.com.google.gson.stream.JsonReader):316:323 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):313 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12 -> com.android.tools.r8.internal.lZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12 -> com.android.tools.r8.internal.bZ:
     1:1:void <init>():332:332 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):332:332 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):343:343 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):332 -> a
     3:7:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12.read(com.android.tools.r8.com.google.gson.stream.JsonReader):335:339 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):332 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13 -> com.android.tools.r8.internal.mZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13 -> com.android.tools.r8.internal.cZ:
     1:1:void <init>():347:347 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):347:347 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):358:358 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):347 -> a
     3:7:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13.read(com.android.tools.r8.com.google.gson.stream.JsonReader):350:354 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):347 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.nZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.dZ:
     1:1:void <init>():362:362 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):362:362 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):378:378 -> a
@@ -18612,7 +18619,7 @@
     13:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
     14:14:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.read(com.android.tools.r8.com.google.gson.stream.JsonReader):371:371 -> a
     14:14:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.oZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.eZ:
     1:1:void <init>():384:384 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):384:384 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Character):399:399 -> a
@@ -18635,35 +18642,35 @@
     19:19:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
     14:14:java.lang.Character com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.read(com.android.tools.r8.com.google.gson.stream.JsonReader):393:393 -> a
     14:14:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.pZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.fZ:
     1:1:void <init>():406:406 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406:406 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.String):422:422 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406 -> a
     3:12:java.lang.String com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16.read(com.android.tools.r8.com.google.gson.stream.JsonReader):409:418 -> a
     3:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):406 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17 -> com.android.tools.r8.internal.qZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17 -> com.android.tools.r8.internal.gZ:
     1:1:void <init>():426:426 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):426:426 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.math.BigDecimal):440:440 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):426 -> a
     3:10:java.math.BigDecimal com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17.read(com.android.tools.r8.com.google.gson.stream.JsonReader):428:435 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):426 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18 -> com.android.tools.r8.internal.rZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18 -> com.android.tools.r8.internal.hZ:
     1:1:void <init>():444:444 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):444:444 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.math.BigInteger):458:458 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):444 -> a
     3:10:java.math.BigInteger com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18.read(com.android.tools.r8.com.google.gson.stream.JsonReader):446:453 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):444 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.sZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.iZ:
     1:1:void <init>():464:464 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464:464 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuilder):475:475 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464 -> a
     3:7:java.lang.StringBuilder com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19.read(com.android.tools.r8.com.google.gson.stream.JsonReader):467:471 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):464 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.FZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.vZ:
     1:1:void <init>():92:92 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):92:92 -> a
     2:11:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.BitSet):136:145 -> a
@@ -18700,55 +18707,55 @@
     89:89:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
     68:81:java.util.BitSet com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):117:130 -> a
     68:81:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.uZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.kZ:
     1:1:void <init>():482:482 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482:482 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuffer):493:493 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482 -> a
     3:7:java.lang.StringBuffer com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20.read(com.android.tools.r8.com.google.gson.stream.JsonReader):485:489 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):482 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.vZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.lZ:
     1:1:void <init>():500:500 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500:500 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URL):512:512 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500 -> a
     3:8:java.net.URL com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21.read(com.android.tools.r8.com.google.gson.stream.JsonReader):503:508 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):500 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.wZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.mZ:
     1:1:void <init>():518:518 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518:518 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URI):534:534 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518 -> a
     3:11:java.net.URI com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22.read(com.android.tools.r8.com.google.gson.stream.JsonReader):521:529 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):518 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.xZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.nZ:
     1:1:void <init>():540:540 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540:540 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.InetAddress):552:552 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540 -> a
     3:8:java.net.InetAddress com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23.read(com.android.tools.r8.com.google.gson.stream.JsonReader):543:548 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):540 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.yZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.oZ:
     1:1:void <init>():559:559 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559:559 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.UUID):570:570 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559 -> a
     3:7:java.util.UUID com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24.read(com.android.tools.r8.com.google.gson.stream.JsonReader):562:566 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):559 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.zZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.pZ:
     1:1:void <init>():576:576 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576:576 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Currency):583:583 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576 -> a
     3:3:java.util.Currency com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25.read(com.android.tools.r8.com.google.gson.stream.JsonReader):579:579 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):576 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26 -> com.android.tools.r8.internal.BZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26 -> com.android.tools.r8.internal.rZ:
     1:1:void <init>():588:588 -> <init>
     1:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):591:595 -> a
     6:6:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):521:521 -> a
     6:6:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):595 -> a
     7:7:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):596:596 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1 -> com.android.tools.r8.internal.AZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1 -> com.android.tools.r8.internal.qZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$dateTypeAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26,com.android.tools.r8.com.google.gson.TypeAdapter):596:596 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):596:596 -> a
@@ -18756,21 +18763,21 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):596 -> a
     3:4:java.sql.Timestamp com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1.read(com.android.tools.r8.com.google.gson.stream.JsonReader):598:599 -> a
     3:4:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):596 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.CZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.sZ:
     1:1:void <init>():609:609 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609:609 -> a
     2:18:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Calendar):654:670 -> a
     2:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609 -> a
     19:48:java.util.Calendar com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27.read(com.android.tools.r8.com.google.gson.stream.JsonReader):619:648 -> a
     19:48:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):609 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.DZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.tZ:
     1:1:void <init>():677:677 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677:677 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Locale):708:708 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677 -> a
     3:26:java.util.Locale com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28.read(com.android.tools.r8.com.google.gson.stream.JsonReader):680:703 -> a
     3:26:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):677 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.EZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.uZ:
     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
@@ -18802,17 +18809,17 @@
     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.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.MZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.CZ:
     1:1:void <init>():151:151 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151:151 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):165:165 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151 -> a
     3:10:java.lang.Boolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3.read(com.android.tools.r8.com.google.gson.stream.JsonReader):154:161 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):151 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$30 -> com.android.tools.r8.internal.GZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$30 -> com.android.tools.r8.internal.wZ:
     1:1:void <init>():824:824 -> <init>
     1:8:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):827:834 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$32 -> com.android.tools.r8.internal.HZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$32 -> com.android.tools.r8.internal.xZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> c
     java.lang.Class val$type -> b
     1:1:void <init>(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):850:850 -> <init>
@@ -18823,7 +18830,7 @@
     859:859:java.lang.String toString():856:856 -> toString
     860:860:java.lang.String toString():856:856 -> toString
     857:857:java.lang.String toString():856:856 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$33 -> com.android.tools.r8.internal.IZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$33 -> com.android.tools.r8.internal.yZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> d
     java.lang.Class val$unboxed -> b
     java.lang.Class val$boxed -> c
@@ -18835,7 +18842,7 @@
     874:874:java.lang.String toString():870:870 -> toString
     875:875:java.lang.String toString():870:870 -> toString
     871:872:java.lang.String toString():870:871 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 -> com.android.tools.r8.internal.JZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 -> com.android.tools.r8.internal.zZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> d
     java.lang.Class val$base -> b
     java.lang.Class val$sub -> c
@@ -18847,7 +18854,7 @@
     889:889:java.lang.String toString():885:885 -> toString
     890:890:java.lang.String toString():885:885 -> toString
     886:887:java.lang.String toString():885:886 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 -> com.android.tools.r8.internal.LZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 -> com.android.tools.r8.internal.BZ:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> c
     java.lang.Class val$clazz -> b
     1:1:void <init>(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):897:897 -> <init>
@@ -18858,7 +18865,7 @@
     923:923:java.lang.String toString():920:920 -> toString
     924:924:java.lang.String toString():920:920 -> toString
     921:921:java.lang.String toString():920:920 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35$1 -> com.android.tools.r8.internal.KZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35$1 -> com.android.tools.r8.internal.AZ:
     com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 this$0 -> b
     java.lang.Class val$requestedType -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35,java.lang.Class):904:904 -> <init>
@@ -18870,49 +18877,49 @@
     920:920:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:912 -> a
     921:921:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:912 -> a
     917:918:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:913 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4 -> com.android.tools.r8.internal.NZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4 -> com.android.tools.r8.internal.DZ:
     1:1:void <init>():173:173 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):173:173 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):183:183 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):173 -> a
     3:7:java.lang.Boolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4.read(com.android.tools.r8.com.google.gson.stream.JsonReader):175:179 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):173 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.OZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.EZ:
     1:1:void <init>():190:190 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190:190 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):206:206 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190 -> a
     3:11:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5.read(com.android.tools.r8.com.google.gson.stream.JsonReader):193:201 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):190 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.PZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.FZ:
     1:1:void <init>():213:213 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213:213 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):228:228 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6.read(com.android.tools.r8.com.google.gson.stream.JsonReader):216:223 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):213 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.QZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.GZ:
     1:1:void <init>():235:235 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235:235 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):250:250 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7.read(com.android.tools.r8.com.google.gson.stream.JsonReader):238:245 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):235 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.RZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.HZ:
     1:1:void <init>():256:256 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256:256 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicInteger):265:265 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256 -> a
     3:5:java.util.concurrent.atomic.AtomicInteger com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8.read(com.android.tools.r8.com.google.gson.stream.JsonReader):259:261 -> a
     3:5:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):256 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.SZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.IZ:
     1:1:void <init>():271:271 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271:271 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicBoolean):276:276 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271 -> a
     3:3:java.util.concurrent.atomic.AtomicBoolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9.read(com.android.tools.r8.com.google.gson.stream.JsonReader):273:273 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):271 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter -> com.android.tools.r8.internal.TZ:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter -> com.android.tools.r8.internal.JZ:
     java.util.Map nameToConstant -> a
     java.util.Map constantToName -> b
     1:1:void <init>(java.lang.Class):793:793 -> <init>
@@ -18922,7 +18929,7 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):789 -> a
     3:7:java.lang.Enum com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):812:816 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):789 -> a
-com.android.tools.r8.com.google.gson.internal.bind.util.ISO8601Utils -> com.android.tools.r8.internal.Dn:
+com.android.tools.r8.com.google.gson.internal.bind.util.ISO8601Utils -> com.android.tools.r8.internal.zn:
     java.util.TimeZone TIMEZONE_UTC -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:52:java.util.Date parse(java.lang.String,java.text.ParsePosition):126:177 -> a
@@ -18953,7 +18960,7 @@
     1216:1216:int parseInt(java.lang.String,int,int):318:318 -> a
     1195:1195:int parseInt(java.lang.String,int,int):318:318 -> a
     1196:1196:int parseInt(java.lang.String,int,int):302:302 -> a
-com.android.tools.r8.com.google.gson.reflect.TypeToken -> com.android.tools.r8.internal.k00:
+com.android.tools.r8.com.google.gson.reflect.TypeToken -> com.android.tools.r8.internal.a00:
     java.lang.reflect.Type type -> b
     java.lang.Class rawType -> a
     int hashCode -> c
@@ -18968,7 +18975,7 @@
     1:2:boolean equals(java.lang.Object):284:285 -> equals
     1:1:int hashCode():280:280 -> hashCode
     1:1:java.lang.String toString():289:289 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.Kv:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.Dv:
     long peekedLong -> j
     int stackSize -> n
     char[] buffer -> d
@@ -19123,18 +19130,18 @@
     3620:3620:int nextInt():1164:1164 -> l
     1179:1204:int nextInt():1164:1189 -> l
     1205:1205:int nextInt():0:0 -> l
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3645,"2":3646,"3":3647}}
-    3645:3645:int nextInt():1189:1189 -> l
-    3646:3646:int nextInt():1189:1189 -> l
-    3647:3647:int nextInt():1189:1189 -> l
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3618,"2":3619,"3":3620}}
+    3618:3618:int nextInt():1189:1189 -> l
+    3619:3619:int nextInt():1189:1189 -> l
+    3620:3620:int nextInt():1189:1189 -> l
     2394:2394:int nextInt():1189:1189 -> l
     2395:2419:int nextInt():1176:1200 -> l
     2420:2420:int nextInt():1196:1196 -> l
     2421:2421:int nextInt():0:0 -> l
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3654,"2":3655,"3":3656}}
-    3654:3654:int nextInt():1196:1196 -> l
-    3655:3655:int nextInt():1196:1196 -> l
-    3656:3656:int nextInt():1196:1196 -> l
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3618,"2":3619,"3":3620}}
+    3618:3618:int nextInt():1196:1196 -> l
+    3619:3619:int nextInt():1196:1196 -> l
+    3620:3620:int nextInt():1196:1196 -> l
     3617:3617:int nextInt():1196:1196 -> l
     1:30:long nextLong():931:960 -> m
     31:31:long nextLong():0:0 -> m
@@ -19146,10 +19153,10 @@
     992:1016:long nextLong():947:971 -> m
     1017:1017:long nextLong():967:967 -> m
     1018:1018:long nextLong():0:0 -> m
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1995,"2":1996,"3":1997}}
-    1995:1995:long nextLong():967:967 -> m
-    1996:1996:long nextLong():967:967 -> m
-    1997:1997:long nextLong():967:967 -> m
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1986,"2":1987,"3":1988}}
+    1986:1986:long nextLong():967:967 -> m
+    1987:1987:long nextLong():967:967 -> m
+    1988:1988:long nextLong():967:967 -> m
     1985:1985:long nextLong():967:967 -> m
     1:16:java.lang.String nextName():777:792 -> n
     17:17:java.lang.String nextName():789:789 -> n
@@ -19191,7 +19198,7 @@
     28:52:void skipValue():1240 -> t
     53:57:void skipValue():1248:1252 -> t
     1:1:java.lang.String toString():1445:1445 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonReader$1 -> com.android.tools.r8.internal.Jv:
+com.android.tools.r8.com.google.gson.stream.JsonReader$1 -> com.android.tools.r8.internal.Cv:
     1:1:void <init>():1585:1585 -> <init>
     1:12:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1591:1602 -> a
     13:13:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):0:0 -> a
@@ -19200,12 +19207,12 @@
     1618:1618:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1602:1602 -> a
     1619:1619:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1602:1602 -> a
     1616:1616:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1603:1603 -> a
-com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Nv:
+com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Gv:
 # {"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.Qv:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.Jv:
     java.lang.String separator -> f
     java.lang.String[] HTML_SAFE_REPLACEMENT_CHARS -> l
     java.lang.String deferredName -> i
@@ -19295,7 +19302,7 @@
     15:15:int com.android.tools.r8.com.google.gson.stream.JsonWriter.peek():367:367 -> l
     15:15:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():612 -> l
     15:15:void writeDeferredName():401 -> l
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.oD:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.hD:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
     1:23:void run(java.lang.String[]):210:232 -> a
@@ -19370,7 +19377,7 @@
     86:106:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):146:166 -> a
 com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions$1 -> com.android.tools.r8.compatproguard.a:
     1:1:void <init>():83:83 -> <init>
-com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.yc:
+com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.xc:
     java.util.Map seenSetForTesting -> c
     java.lang.Thread mainThread -> b
     java.util.function.Consumer testingConsumer -> a
@@ -19391,12 +19398,12 @@
     68:68:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
     63:63:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
     69:71:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():66:68 -> a
-com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.uc:
+com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.tc:
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.contexts.CompilationContext$1):17:17 -> <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.vc:
+com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.uc:
     com.android.tools.r8.graph.ProgramMethod method -> b
     int nextId -> c
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext parent -> a
@@ -19416,7 +19423,7 @@
     3:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.buildSuffix(java.lang.StringBuilder):148:150 -> b
     3:5:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):162 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod getMethodContext():143:143 -> c
-com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.wc:
+com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.vc:
     com.android.tools.r8.contexts.CompilationContext parent -> a
     int processorId -> b
     boolean $assertionsDisabled -> c
@@ -19438,7 +19445,7 @@
     8:8:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):105 -> a
     1:1:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):100:100 -> b
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):110 -> b
-com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.xc:
+com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.wc:
     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):166:166 -> <init>
@@ -19457,149 +19464,17 @@
     5:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSyntheticSuffix(java.lang.StringBuilder):186 -> b
     5:5:java.lang.String getSyntheticSuffix():194 -> b
     6:6:java.lang.String getSyntheticSuffix():194:194 -> b
-com.android.tools.r8.debuginfo.DebugRepresentation -> com.android.tools.r8.internal.Je:
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap paramToInfo -> a
-    boolean $assertionsDisabled -> b
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):67:68 -> <init>
-    boolean lambda$fromFiles$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
-    1:1:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):38:38 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1899:1899 -> a
-    2:2:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):38 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1899:1899 -> a
-    3:3:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):38 -> a
-    4:5:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):38:39 -> a
-    6:6:void lambda$fromFiles$2(java.util.Map,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.DexProgramClass):53:53 -> a
-    7:7:com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary lambda$computeForFile$4(int):102:102 -> a
-    8:8:void lambda$computeForFile$5(java.lang.Integer,com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):107:107 -> a
-    9:9:java.lang.Integer lambda$toString$6(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):132:132 -> a
-    10:14:boolean com.android.tools.r8.debuginfo.DebugRepresentation.isPcCandidate(com.android.tools.r8.graph.DexEncodedMethod):137:141 -> a
-    10:14:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):56 -> a
-    15:17:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):59:61 -> a
-    18:22:boolean com.android.tools.r8.debuginfo.DebugRepresentation.usesPcEncoding(com.android.tools.r8.graph.DexEncodedMethod):114:118 -> a
-    18:22:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):61 -> a
-    23:24:com.android.tools.r8.code.Instruction com.android.tools.r8.debuginfo.DebugRepresentation.getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):267:268 -> a
-    23:24:boolean com.android.tools.r8.debuginfo.DebugRepresentation.usesPcEncoding(com.android.tools.r8.graph.DexEncodedMethod):121 -> a
-    23:24:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):61 -> a
-    25:26:boolean com.android.tools.r8.debuginfo.DebugRepresentation.usesPcEncoding(com.android.tools.r8.graph.DexEncodedMethod):125:126 -> a
-    25:26:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):61 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1899:1899 -> a
-    27:27:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):73 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1899:1899 -> a
-    28:28:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):73 -> a
-    29:35:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):74:80 -> a
-    36:36:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
-    36:36:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):80 -> a
-    37:45:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):81:89 -> a
-    46:50:boolean com.android.tools.r8.debuginfo.DebugRepresentation.isPcCandidate(com.android.tools.r8.graph.DexEncodedMethod):137:141 -> a
-    46:50:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):90 -> a
-    51:52:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):93:94 -> a
-    53:54:com.android.tools.r8.code.Instruction com.android.tools.r8.debuginfo.DebugRepresentation.getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):267:268 -> a
-    53:54:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):95 -> a
-    55:55:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):99:99 -> a
-    56:67:int com.android.tools.r8.debuginfo.DebugRepresentation.estimatedDebugInfoSize(com.android.tools.r8.graph.DexDebugInfo):276:287 -> a
-    56:67:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):100 -> a
-    68:76:void computeForFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):102:110 -> a
-    77:77:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1899:1899 -> a
-    77:77:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):44 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    78:78:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1899:1899 -> a
-    78:78:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):44 -> a
-    79:89:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):45:55 -> a
-    90:90:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):48:48 -> a
-    boolean lambda$none$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> b
-    1:3:java.lang.String toString():131:133 -> toString
-com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary -> com.android.tools.r8.internal.Ge:
-    int normalPreCutoffCost -> f
-    int normalPostCutoffCost -> g
-    int maxPc -> d
-    int cutoff -> e
-    boolean $assertionsDisabled -> h
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap pcToCost -> b
-    int minPc -> c
-    int paramCount -> a
-    1:1:void <clinit>():164:164 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.debuginfo.DebugRepresentation$1):164:164 -> <init>
-    2:2:void <init>(int):178:178 -> <init>
-    3:14:void <init>(int):169:180 -> <init>
-    1:1:void access$000(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,int,int):164:164 -> a
-    2:2:int access$100(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164:164 -> a
-    3:4:void addCost(int,int):184:185 -> a
-    5:5:void com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost.add(int):157:157 -> a
-    5:5:void addCost(int,int):185 -> a
-    6:6:void addCost(int,int):185:185 -> a
-    7:7:void com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost.add(int):157:157 -> a
-    7:7:void addCost(int,int):185 -> a
-    8:8:void com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost.add(int):158:158 -> a
-    8:8:void addCost(int,int):185 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:void com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost.add(int):159:159 -> a
-    9:9:void addCost(int,int):185 -> a
-    10:11:void addCost(int,int):186:187 -> a
-    1:1:int access$200(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164:164 -> b
-    1:1:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():191:191 -> c
-    1:1:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    2:2:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():191:191 -> c
-    2:2:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():191:191 -> c
-    3:3:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    11:11:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():199:199 -> c
-    11:11:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:37:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():199:224 -> c
-    12:37:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    38:38:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():230:230 -> c
-    38:38:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():225 -> c
-    38:38:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    39:41:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):152:154 -> c
-    39:41:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():230 -> c
-    39:41:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():225 -> c
-    39:41:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    42:42:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():225:225 -> c
-    42:42:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    43:43:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():234:234 -> c
-    43:43:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():226 -> c
-    43:43:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    44:46:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):152:154 -> c
-    44:46:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():234 -> c
-    44:46:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():226 -> c
-    44:46:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    47:47:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():226:226 -> c
-    47:47:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):164 -> c
-    1:13:java.lang.String toString():239:251 -> toString
-    14:14:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():230:230 -> toString
-    14:14:java.lang.String toString():252 -> toString
-    15:17:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):152:154 -> toString
-    15:17:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():230 -> toString
-    15:17:java.lang.String toString():252 -> toString
-    18:24:java.lang.String toString():252:258 -> toString
-    25:25:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():234:234 -> toString
-    25:25:java.lang.String toString():259 -> toString
-    26:28:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):152:154 -> toString
-    26:28:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():234 -> toString
-    26:28:java.lang.String toString():259 -> toString
-    29:31:java.lang.String toString():259:261 -> toString
-com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate -> com.android.tools.r8.internal.He:
-    boolean useDexPcEncoding(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost -> com.android.tools.r8.internal.Ie:
-    boolean $assertionsDisabled -> b
-    int cost -> a
-    1:1:void <clinit>():145:145 -> <clinit>
-    1:2:void <init>(int):151:152 -> <init>
-com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.Lf:
+com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.Gf:
     com.android.tools.r8.utils.InternalOptions options -> b
     com.android.tools.r8.naming.NamingLens namingLens -> a
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):51:54 -> <init>
     1:1:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():66:66 -> a
     1:1:void runIfNecessary(com.android.tools.r8.utils.Timing):58 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     2:2:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:void runIfNecessary(com.android.tools.r8.utils.Timing):58 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     3:3:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():66 -> a
     3:3:void runIfNecessary(com.android.tools.r8.utils.Timing):58 -> a
     4:4:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():66:66 -> a
@@ -19775,9 +19650,9 @@
     1:24:void readDexSources(java.util.List,java.util.Queue):355:378 -> b
     25:25:void readDexSources(java.util.List,java.util.Queue):377:377 -> b
     26:38:void readSources():431:443 -> b
-com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver -> com.android.tools.r8.internal.s2:
+com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver -> com.android.tools.r8.internal.r2:
     com.android.tools.r8.graph.DexProgramClass resolveClassConflict(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.internal.D2:
+com.android.tools.r8.dex.ApplicationWriter -> com.android.tools.r8.internal.C2:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> k
     com.android.tools.r8.dex.CodeToKeep desugaredLibraryCodeToKeep -> f
@@ -19789,282 +19664,282 @@
     com.android.tools.r8.graph.InitClassLens initClassLens -> c
     java.util.function.Predicate isTypeMissing -> g
     com.android.tools.r8.graph.GraphLens graphLens -> b
-    1:1:void <clinit>():81:81 -> <clinit>
-    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):164:164 -> <init>
-    2:12: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.DexIndexedConsumer):179:189 -> <init>
+    1:1:void <clinit>():79:79 -> <clinit>
+    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):162:162 -> <init>
+    2:12: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.DexIndexedConsumer):177:187 -> <init>
     1:1:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":316,"2":317,"3":318}}
-    316:316:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):297:297 -> a
-    317:317:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):297:297 -> a
-    318:318:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):297:297 -> a
-    298:298:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):297:297 -> a
-    299:304:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):454:459 -> a
-    299:304:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):298 -> a
-    305:310:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):458:463 -> a
-    305:310:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):298 -> a
-    311:313:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):462:464 -> a
-    311:313:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):298 -> a
-    314:315:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):300:301 -> a
-    319:319:com.android.tools.r8.graph.DexString access$000(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):81:81 -> a
-    320:320:java.util.List distribute(java.util.concurrent.ExecutorService):196:196 -> a
-    321:321:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():477:477 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":313,"2":314,"3":315}}
+    313:313:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):295:295 -> a
+    314:314:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):295:295 -> a
+    315:315:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):295:295 -> a
+    296:296:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):295:295 -> a
+    297:302:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):446:451 -> a
+    297:302:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):296 -> a
+    303:308:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):450:455 -> a
+    303:308:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):296 -> a
+    309:311:void com.android.tools.r8.dex.ApplicationWriter.computeOffsetMappingAndRewriteJumboStrings(com.android.tools.r8.dex.VirtualFile,java.util.List,com.android.tools.r8.utils.Timing):454:456 -> a
+    309:311:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):296 -> a
+    312:312:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):298:298 -> a
+    316:316:com.android.tools.r8.graph.DexString access$000(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):79:79 -> a
+    317:317:java.util.List distribute(java.util.concurrent.ExecutorService):194:194 -> a
+    318:318:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():476:476 -> a
+    318:318:java.util.List distribute(java.util.concurrent.ExecutorService):194 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    319:319:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():476:476 -> a
+    319:319:java.util.List distribute(java.util.concurrent.ExecutorService):194 -> a
+    320:320:java.util.List distribute(java.util.concurrent.ExecutorService):195:195 -> a
+    321:321:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():492:492 -> a
     321:321:java.util.List distribute(java.util.concurrent.ExecutorService):196 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    322:322:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():477:477 -> a
+    322:322:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():492:492 -> a
     322:322:java.util.List distribute(java.util.concurrent.ExecutorService):196 -> a
-    323:323:java.util.List distribute(java.util.concurrent.ExecutorService):197:197 -> a
-    324:324:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():493:493 -> a
-    324:324:java.util.List distribute(java.util.concurrent.ExecutorService):198 -> a
+    323:332:java.util.List distribute(java.util.concurrent.ExecutorService):196:205 -> a
+    333:333:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):197:197 -> a
+    333:333:void lambda$rewriteSourceFile$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):440 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    325:325:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():493:493 -> a
-    325:325:java.util.List distribute(java.util.concurrent.ExecutorService):198 -> a
-    326:335:java.util.List distribute(java.util.concurrent.ExecutorService):198:207 -> a
-    336:336:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):197:197 -> a
-    336:336:void lambda$rewriteSourceFile$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):448 -> a
+    334:335:void encodeChecksums(java.lang.Iterable):215:216 -> a
+    336:336:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.<init>(int):110:110 -> a
+    336:336:void encodeChecksums(java.lang.Iterable):216 -> a
+    337:346:void encodeChecksums(java.lang.Iterable):217:226 -> a
+    347:352:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):242:247 -> a
+    353:353:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):354:354 -> a
+    353:353:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    354:354:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():231:231 -> a
+    354:354:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):356 -> a
+    354:354:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    355:368:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):358:371 -> a
+    355:368:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    369:369:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.Marker.toDexString(com.android.tools.r8.graph.DexItemFactory):296:296 -> a
+    369:369:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):371 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    337:338:void encodeChecksums(java.lang.Iterable):217:218 -> a
-    339:339:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.<init>(int):110:110 -> a
-    339:339:void encodeChecksums(java.lang.Iterable):218 -> a
-    340:349:void encodeChecksums(java.lang.Iterable):219:228 -> a
-    350:355:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):244:249 -> a
-    356:356:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):362:362 -> a
-    356:356:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
-    357:357:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():233:233 -> a
-    357:357:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):364 -> a
-    357:357:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
-    358:371:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):366:379 -> a
-    358:371:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
-    372:372:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.Marker.toDexString(com.android.tools.r8.graph.DexItemFactory):296:296 -> a
-    372:372:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):379 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    372:372:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
-    373:373:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.Marker.toDexString(com.android.tools.r8.graph.DexItemFactory):296:296 -> a
-    373:373:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):379 -> a
-    373:373:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
-    374:374:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):379:379 -> a
+    369:369:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    370:370:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.Marker.toDexString(com.android.tools.r8.graph.DexItemFactory):296:296 -> a
+    370:370:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List):371 -> a
+    370:370:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    371:371:void com.android.tools.r8.dex.ApplicationWriter.computeMarkerStrings(com.android.tools.r8.utils.Box,java.util.List) -> a
+    371:371:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):248 -> a
+    372:373:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):378:379 -> a
+    372:373:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
+    374:374:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():231:231 -> a
+    374:374:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):381 -> a
     374:374:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
-    375:376:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):386:387 -> a
-    375:376:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):252 -> a
-    377:377:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():233:233 -> a
-    377:377:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):389 -> a
-    377:377:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):252 -> a
-    378:387:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):390:399 -> a
-    378:387:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):252 -> a
-    388:388:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):197:197 -> a
-    388:388:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):400 -> a
-    388:388:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):252 -> a
-    389:397:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):404:412 -> a
-    389:397:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):252 -> a
-    398:421:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):255:278 -> a
-    422:452:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):276:306 -> a
-    453:453:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():233:233 -> a
-    453:453:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):311 -> a
-    454:456:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):314:316 -> a
-    457:490:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):315:348 -> a
-    491:491:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
-    491:491:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):348 -> a
+    375:384:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):382:391 -> a
+    375:384:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
+    385:385:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):197:197 -> a
+    385:385:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):392 -> a
+    385:385:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
+    386:394:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):396:404 -> a
+    386:394:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):250 -> a
+    395:418:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):253:276 -> a
+    419:448:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):274:303 -> a
+    449:449:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():231:231 -> a
+    449:449:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):307 -> a
+    450:452:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):308:308 -> a
+    457:484:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):313:340 -> a
+    485:485:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
+    485:485:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):340 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    492:492:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
-    492:492:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):348 -> a
-    493:501:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):348:356 -> a
-    502:502:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):280:280 -> a
-    503:503:void lambda$write$1(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):286:286 -> a
-    504:516:com.android.tools.r8.SourceFileEnvironment createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):417:429 -> a
-    517:520:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):527:530 -> a
-    521:528:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):528:535 -> a
-    529:537:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):534:542 -> a
-    538:571:void com.android.tools.r8.dex.ApplicationWriter.adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):591:624 -> a
-    538:571:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):545 -> a
-    572:603:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):550:581 -> a
-    604:637:void com.android.tools.r8.dex.ApplicationWriter.adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):591:624 -> a
-    604:637:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):580 -> a
-    638:638:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):557:557 -> a
-    639:648:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):556:565 -> a
-    649:655:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):560:566 -> a
-    656:656:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1234,"2":1235,"3":1236,"4":1237,"5":1238}}
-    1234:1234:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):566:566 -> a
-    1235:1235:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):566:566 -> a
-    1236:1236:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):566:566 -> a
-    1237:1237:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):566:566 -> a
-    1238:1238:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):566:566 -> a
-    1224:1224:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):568:568 -> a
-    1225:1225:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):559:559 -> a
-    1226:1226:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
-    1239:1239:void insertAttributeAnnotations():631:631 -> a
-    1240:1254:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):639:653 -> a
-    1240:1254:void insertAttributeAnnotations():632 -> a
-    1255:1255:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):652:652 -> a
-    1255:1255:void insertAttributeAnnotations():632 -> a
-    1256:1264:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):651:659 -> a
-    1256:1264:void insertAttributeAnnotations():632 -> a
-    1265:1265:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):658:658 -> a
-    1265:1265:void insertAttributeAnnotations():632 -> a
-    1266:1282:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):657:673 -> a
-    1266:1282:void insertAttributeAnnotations():632 -> a
-    1283:1289:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):672:678 -> a
-    1283:1289:void insertAttributeAnnotations():632 -> a
-    1290:1299:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):183:192 -> a
-    1290:1299:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):676 -> a
-    1290:1299:void insertAttributeAnnotations():632 -> a
-    1300:1308:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):675:683 -> a
-    1300:1308:void insertAttributeAnnotations():632 -> a
-    1309:1309:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):682:682 -> a
-    1309:1309:void insertAttributeAnnotations():632 -> a
-    1310:1321:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):681:692 -> a
-    1310:1321:void insertAttributeAnnotations():632 -> a
-    1322:1330:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):691:699 -> a
-    1322:1330:void insertAttributeAnnotations():632 -> a
-    1331:1331:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:276 -> a
-    1331:1331:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):699 -> a
-    1331:1331:void insertAttributeAnnotations():632 -> a
+    486:486:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
+    486:486:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):340 -> a
+    487:495:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):340:348 -> a
+    496:496:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):278:278 -> a
+    497:497:void lambda$write$1(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):284:284 -> a
+    498:510:com.android.tools.r8.SourceFileEnvironment createSourceFileEnvironment(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):409:421 -> a
+    511:514:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):519:522 -> a
+    515:522:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):520:527 -> a
+    523:531:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):526:534 -> a
+    532:565:void com.android.tools.r8.dex.ApplicationWriter.adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):583:616 -> a
+    532:565:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):537 -> a
+    566:597:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):542:573 -> a
+    598:631:void com.android.tools.r8.dex.ApplicationWriter.adaptAndPassDataResources(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.DataResourceConsumer,java.util.Collection,com.android.tools.r8.dex.ResourceAdapter):583:616 -> a
+    598:631:void supplyAdditionalConsumers(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):572 -> a
+    632:632:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):549:549 -> a
+    633:642:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):548:557 -> a
+    643:649:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):552:558 -> a
+    650:650:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1220,"2":1221,"3":1222,"4":1223,"5":1224}}
+    1220:1220:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
+    1221:1221:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
+    1222:1222:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
+    1223:1223:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
+    1224:1224:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):558:558 -> a
+    1210:1210:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):560:560 -> a
+    1211:1211:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):551:551 -> a
+    1212:1212:void lambda$supplyAdditionalConsumers$5(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexType,java.util.List):550:550 -> a
+    1225:1225:void insertAttributeAnnotations():623:623 -> a
+    1226:1240:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):631:645 -> a
+    1226:1240:void insertAttributeAnnotations():624 -> a
+    1241:1241:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):644:644 -> a
+    1241:1241:void insertAttributeAnnotations():624 -> a
+    1242:1250:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):643:651 -> a
+    1242:1250:void insertAttributeAnnotations():624 -> a
+    1251:1251:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):650:650 -> a
+    1251:1251:void insertAttributeAnnotations():624 -> a
+    1252:1268:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):649:665 -> a
+    1252:1268:void insertAttributeAnnotations():624 -> a
+    1269:1275:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):664:670 -> a
+    1269:1275:void insertAttributeAnnotations():624 -> a
+    1276:1285:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createInnerClassAnnotation(com.android.tools.r8.graph.DexString,int,com.android.tools.r8.graph.DexItemFactory):183:192 -> a
+    1276:1285:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):668 -> a
+    1276:1285:void insertAttributeAnnotations():624 -> a
+    1286:1294:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):667:675 -> a
+    1286:1294:void insertAttributeAnnotations():624 -> a
+    1295:1295:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):674:674 -> a
+    1295:1295:void insertAttributeAnnotations():624 -> a
+    1296:1307:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):673:684 -> a
+    1296:1307:void insertAttributeAnnotations():624 -> a
+    1308:1316:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):683:691 -> a
+    1308:1316:void insertAttributeAnnotations():624 -> a
+    1317:1317:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:276 -> a
+    1317:1317:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):691 -> a
+    1317:1317:void insertAttributeAnnotations():624 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1334:1337:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):279:282 -> a
-    1334:1337:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):699 -> a
-    1334:1337:void insertAttributeAnnotations():632 -> a
-    1338:1338:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):699:699 -> a
-    1338:1338:void insertAttributeAnnotations():632 -> a
-    1339:1339:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698:698 -> a
-    1339:1339:void insertAttributeAnnotations():632 -> a
-    1340:1351:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):697:708 -> a
-    1340:1351:void insertAttributeAnnotations():632 -> a
-    1352:1352:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71:71 -> a
-    1352:1352:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):706 -> a
-    1352:1352:void insertAttributeAnnotations():632 -> a
-    1353:1353:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    1353:1353:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71 -> a
-    1353:1353:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):706 -> a
-    1353:1353:void insertAttributeAnnotations():632 -> a
-    1354:1355:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:73 -> a
-    1354:1355:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):706 -> a
-    1354:1355:void insertAttributeAnnotations():632 -> a
-    1356:1366:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):706:716 -> a
-    1356:1366:void insertAttributeAnnotations():632 -> a
-    1367:1368:void insertAttributeAnnotations():633:634 -> a
-    1369:1378:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):720:729 -> a
-    1379:1379:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
-    1379:1379:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):729 -> a
+    1320:1323:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):279:282 -> a
+    1320:1323:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):691 -> a
+    1320:1323:void insertAttributeAnnotations():624 -> a
+    1324:1324:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):691:691 -> a
+    1324:1324:void insertAttributeAnnotations():624 -> a
+    1325:1325:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):690:690 -> a
+    1325:1325:void insertAttributeAnnotations():624 -> a
+    1326:1337:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):689:700 -> a
+    1326:1337:void insertAttributeAnnotations():624 -> a
+    1338:1338:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71:71 -> a
+    1338:1338:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1338:1338:void insertAttributeAnnotations():624 -> a
+    1339:1339:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    1339:1339:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71 -> a
+    1339:1339:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1339:1339:void insertAttributeAnnotations():624 -> a
+    1340:1341:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:73 -> a
+    1340:1341:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698 -> a
+    1340:1341:void insertAttributeAnnotations():624 -> a
+    1342:1352:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):698:708 -> a
+    1342:1352:void insertAttributeAnnotations():624 -> a
+    1353:1354:void insertAttributeAnnotations():625:626 -> a
+    1355:1364:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):712:721 -> a
+    1365:1365:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
+    1365:1365:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):721 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1382:1385:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
-    1382:1385:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):729 -> a
-    1386:1386:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):729:729 -> a
-    1387:1387:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):728:728 -> a
-    1388:1388:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):726:726 -> a
-    1389:1389:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):725:725 -> a
-    1390:1397:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):724:731 -> a
-    1398:1407:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):735:744 -> a
-    1408:1408:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:878 -> a
-    1408:1408:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):744 -> a
+    1368:1371:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
+    1368:1371:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):721 -> a
+    1372:1372:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):721:721 -> a
+    1373:1373:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):720:720 -> a
+    1374:1374:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):718:718 -> a
+    1375:1375:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):717:717 -> a
+    1376:1383:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):716:723 -> a
+    1384:1393:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):727:736 -> a
+    1394:1394:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:878 -> a
+    1394:1394:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):736 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1411:1414:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):881:884 -> a
-    1411:1414:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):744 -> a
-    1415:1415:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):744:744 -> a
-    1416:1416:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):743:743 -> a
-    1417:1417:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):741:741 -> a
-    1418:1418:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):740:740 -> a
-    1419:1426:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):739:746 -> a
-    1427:1427:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):755:755 -> a
-    1428:1428:void lambda$setCallSiteContexts$6(com.android.tools.r8.graph.ProgramMethod):757:757 -> a
-    1429:1441:void rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):772:784 -> a
-    1442:1449:void lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.ProgramMethod):787:794 -> a
-    1450:1461:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.utils.Timing):801:812 -> a
-    1462:1462:com.android.tools.r8.dex.FileWriter lambda$writeDexFile$8(com.android.tools.r8.dex.FileWriter):810:810 -> a
-    1463:1464:java.lang.String com.android.tools.r8.dex.ApplicationWriter.mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):816:817 -> a
-    1463:1464:void lambda$writeMainDexList$10(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):828 -> a
-    1465:1465:void lambda$writeMainDexList$10(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):828:828 -> a
-    1466:1473:java.lang.String writeMainDexList(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):822:829 -> a
+    1397:1400:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):881:884 -> a
+    1397:1400:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):736 -> a
+    1401:1401:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):736:736 -> a
+    1402:1402:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):735:735 -> a
+    1403:1403:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):733:733 -> a
+    1404:1404:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):732:732 -> a
+    1405:1412:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):731:738 -> a
+    1413:1413:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):747:747 -> a
+    1414:1414:void lambda$setCallSiteContexts$6(com.android.tools.r8.graph.ProgramMethod):749:749 -> a
+    1415:1427:void rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):764:776 -> a
+    1428:1435:void lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.ProgramMethod):779:786 -> a
+    1436:1447:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.utils.Timing):793:804 -> a
+    1448:1448:com.android.tools.r8.dex.FileWriter lambda$writeDexFile$8(com.android.tools.r8.dex.FileWriter):802:802 -> a
+    1449:1450:java.lang.String com.android.tools.r8.dex.ApplicationWriter.mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):808:809 -> a
+    1449:1450:void lambda$writeMainDexList$10(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):820 -> a
+    1451:1451:void lambda$writeMainDexList$10(java.lang.StringBuilder,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType):820:820 -> a
+    1452:1459:java.lang.String writeMainDexList(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):814:821 -> a
     1:1:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":391,"2":392,"3":393}}
-    391:391:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):336:336 -> b
-    392:392:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):336:336 -> b
-    393:393:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):336:336 -> b
-    337:337:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):336:336 -> b
-    338:348:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):469:479 -> b
-    338:348:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):337 -> b
-    349:349:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():493:493 -> b
-    349:349:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):479 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":383,"2":384,"3":385}}
+    383:383:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+    384:384:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+    385:385:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+    329:329:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
+    330:340:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):461:471 -> b
+    330:340:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    341:341:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():492:492 -> b
+    341:341:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):471 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    349:349:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):337 -> b
-    350:350:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():493:493 -> b
-    350:350:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):479 -> b
-    350:350:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):337 -> b
-    351:357:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):482:488 -> b
-    351:357:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):337 -> b
-    358:358:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():489:489 -> b
-    358:358:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):488 -> b
+    341:341:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    342:342:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():492:492 -> b
+    342:342:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):471 -> b
+    342:342:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    343:349:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):474:480 -> b
+    343:349:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    350:350:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():488:488 -> b
+    350:350:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):480 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    358:358:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):337 -> b
-    359:359:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():489:489 -> b
-    359:359:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):488 -> b
-    359:359:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):337 -> b
-    360:376:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):493:509 -> b
-    360:376:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):337 -> b
-    377:389:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):506:518 -> b
-    377:389:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):337 -> b
-    390:390:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):338:338 -> b
-    394:399:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):443:448 -> b
-    400:402:void setCallSiteContexts(java.util.concurrent.ExecutorService):750:750 -> b
-    403:403:com.android.tools.r8.dex.FileWriter$ByteBufferResult lambda$writeDexFile$9(com.android.tools.r8.dex.FileWriter):812:812 -> b
-    1:1:void write(java.util.concurrent.ExecutorService):238:238 -> c
-    2:2:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():233:233 -> c
-    2:2:void write(java.util.concurrent.ExecutorService):238 -> c
-    3:4:void write(java.util.concurrent.ExecutorService):238:239 -> c
-com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.internal.w2:
+    350:350:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    351:351:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():488:488 -> b
+    351:351:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):480 -> b
+    351:351:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    352:368:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):485:501 -> b
+    352:368:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    369:381:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):498:510 -> b
+    369:381:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
+    382:382:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):330:330 -> b
+    386:391:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):435:440 -> b
+    392:394:void setCallSiteContexts(java.util.concurrent.ExecutorService):742:742 -> b
+    395:395:com.android.tools.r8.dex.FileWriter$ByteBufferResult lambda$writeDexFile$9(com.android.tools.r8.dex.FileWriter):804:804 -> b
+    1:1:void write(java.util.concurrent.ExecutorService):236:236 -> c
+    2:2:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():231:231 -> c
+    2:2:void write(java.util.concurrent.ExecutorService):236 -> c
+    3:4:void write(java.util.concurrent.ExecutorService):236:237 -> c
+com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.internal.v2:
     com.android.tools.r8.dex.ApplicationWriter this$0 -> d
     com.android.tools.r8.utils.Box val$delayedProguardMapId -> c
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.Box):367:367 -> <init>
-    1:3:com.android.tools.r8.graph.DexString internalCompute():371:373 -> b
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.Box):359:359 -> <init>
+    1:3:com.android.tools.r8.graph.DexString internalCompute():363:365 -> b
     4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.dex.Marker.toDexString(com.android.tools.r8.graph.DexItemFactory):296:296 -> b
-    4:4:com.android.tools.r8.graph.DexString internalCompute():373 -> b
-com.android.tools.r8.dex.ApplicationWriter$2 -> com.android.tools.r8.internal.x2:
+    4:4:com.android.tools.r8.graph.DexString internalCompute():365 -> b
+com.android.tools.r8.dex.ApplicationWriter$2 -> com.android.tools.r8.internal.w2:
     com.android.tools.r8.dex.ApplicationWriter this$0 -> d
     com.android.tools.r8.utils.Box val$delayedProguardMapId -> c
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.Box):405:405 -> <init>
-    1:1:com.android.tools.r8.graph.DexString internalCompute():408:408 -> b
-com.android.tools.r8.dex.ApplicationWriter$3 -> com.android.tools.r8.internal.y2:
-    1:1:void <init>():417:417 -> <init>
-com.android.tools.r8.dex.ApplicationWriter$4 -> com.android.tools.r8.internal.z2:
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.Box):397:397 -> <init>
+    1:1:com.android.tools.r8.graph.DexString internalCompute():400:400 -> b
+com.android.tools.r8.dex.ApplicationWriter$3 -> com.android.tools.r8.internal.x2:
+    1:1:void <init>():409:409 -> <init>
+com.android.tools.r8.dex.ApplicationWriter$4 -> com.android.tools.r8.internal.y2:
     com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId val$proguardMapId -> a
-    1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):429:429 -> <init>
-    1:1:java.lang.String getMapHash():437:437 -> getMapHash
-    1:1:java.lang.String getMapId():432:432 -> getMapId
-com.android.tools.r8.dex.ApplicationWriter$5 -> com.android.tools.r8.internal.A2:
+    1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):421:421 -> <init>
+    1:1:java.lang.String getMapHash():429:429 -> getMapHash
+    1:1:java.lang.String getMapId():424:424 -> getMapId
+com.android.tools.r8.dex.ApplicationWriter$5 -> com.android.tools.r8.internal.z2:
     com.android.tools.r8.dex.ResourceAdapter val$resourceAdapter -> a
     com.android.tools.r8.DataResourceConsumer val$dataResourceConsumer -> b
     java.util.Set val$generatedResourceNames -> d
     com.android.tools.r8.utils.InternalOptions val$options -> c
-    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):596:596 -> <init>
-    1:4:void visit(com.android.tools.r8.DataDirectoryResource):599:602 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):608:608 -> visit
+    1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,com.android.tools.r8.DataResourceConsumer,com.android.tools.r8.utils.InternalOptions,java.util.Set):588:588 -> <init>
+    1:4:void visit(com.android.tools.r8.DataDirectoryResource):591:594 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):600:600 -> visit
     6:6:boolean com.android.tools.r8.dex.ResourceAdapter.isService(com.android.tools.r8.DataEntryResource):108:108 -> visit
-    6:6:void visit(com.android.tools.r8.DataEntryResource):608 -> visit
-    7:11:void visit(com.android.tools.r8.DataEntryResource):613:617 -> visit
+    6:6:void visit(com.android.tools.r8.DataEntryResource):600 -> visit
+    7:11:void visit(com.android.tools.r8.DataEntryResource):605:609 -> visit
     12:12:void visit(com.android.tools.r8.DataEntryResource):0:0 -> visit
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":635,"2":636,"3":637}}
-    635:635:void visit(com.android.tools.r8.DataEntryResource):617:617 -> visit
-    636:636:void visit(com.android.tools.r8.DataEntryResource):617:617 -> visit
-    637:637:void visit(com.android.tools.r8.DataEntryResource):617:617 -> visit
-    630:630:void visit(com.android.tools.r8.DataEntryResource):618:618 -> visit
-    631:634:void visit(com.android.tools.r8.DataEntryResource):617:620 -> visit
-com.android.tools.r8.dex.ApplicationWriter$LazyDexString -> com.android.tools.r8.internal.B2:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":627,"2":628,"3":629}}
+    627:627:void visit(com.android.tools.r8.DataEntryResource):609:609 -> visit
+    628:628:void visit(com.android.tools.r8.DataEntryResource):609:609 -> visit
+    629:629:void visit(com.android.tools.r8.DataEntryResource):609:609 -> visit
+    622:622:void visit(com.android.tools.r8.DataEntryResource):610:610 -> visit
+    623:626:void visit(com.android.tools.r8.DataEntryResource):609:612 -> visit
+com.android.tools.r8.dex.ApplicationWriter$LazyDexString -> com.android.tools.r8.internal.A2:
     boolean computed -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():832:832 -> <clinit>
-    1:2:void <init>():832:833 -> <init>
-    1:3:com.android.tools.r8.graph.DexString compute():838:840 -> a
+    1:1:void <clinit>():824:824 -> <clinit>
+    1:2:void <init>():824:825 -> <init>
+    1:3:com.android.tools.r8.graph.DexString compute():830:832 -> a
     com.android.tools.r8.graph.DexString internalCompute() -> b
-com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.internal.C2:
+com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.internal.B2:
     com.android.tools.r8.naming.NamingLens namingLens -> a
-    1:2:void <init>(com.android.tools.r8.naming.NamingLens):99:100 -> <init>
+    1:2:void <init>(com.android.tools.r8.naming.NamingLens):97:98 -> <init>
     boolean add(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode) -> a
     boolean add(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean add(com.android.tools.r8.graph.DexTypeList) -> a
     boolean add(com.android.tools.r8.graph.ParameterAnnotationsList) -> a
     boolean add(com.android.tools.r8.graph.DexDebugInfoForWriting) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
-    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):106:106 -> a
-    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):113:113 -> a
-    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):120:121 -> a
+    1:1:boolean add(com.android.tools.r8.graph.DexAnnotationSet):104:104 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexAnnotation):111:111 -> a
+    3:4:boolean add(com.android.tools.r8.graph.DexEncodedArray):118:119 -> a
 com.android.tools.r8.dex.BinaryReader -> com.android.tools.r8.dex.c:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.dex.CompatByteBuffer buffer -> b
@@ -20079,7 +19954,7 @@
     1:1:int getUleb128():44:44 -> d
     1:1:int getUleb128p1():52 -> d
     1:2:int getUshort():62:63 -> e
-com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.ib:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.hb:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -20096,7 +19971,7 @@
     15:15:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> b
     15:15:void tryParseAndAppend(com.android.tools.r8.graph.DexString):65 -> b
     16:16:void tryParseAndAppend(com.android.tools.r8.graph.DexString):66:66 -> b
-com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.internal.Ib:
+com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.internal.Hb:
     1:1:void <init>():24:24 -> <init>
     void generateKeepRules(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isNop() -> a
@@ -20105,14 +19980,14 @@
     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):27:28 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     4:4:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29 -> a
     5:9:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29:33 -> a
     10:10:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):31:31 -> a
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.internal.Gb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.internal.Fb:
     java.util.Map toKeep -> b
     com.android.tools.r8.naming.NamingLens namingLens -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -20167,18 +20042,18 @@
     87:87:boolean shouldKeep(com.android.tools.r8.graph.DexType):73:73 -> c
     79:83:boolean shouldKeep(com.android.tools.r8.graph.DexType):73:77 -> c
     84:84:boolean shouldKeep(com.android.tools.r8.graph.DexType):74:74 -> c
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$2 -> com.android.tools.r8.internal.Eb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$2 -> com.android.tools.r8.internal.Db:
     1:1:void <init>():205:205 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):205:205 -> compare
     2:2:int com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$2.compare(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):208:208 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):205 -> compare
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.internal.Fb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.internal.Eb:
     java.util.Set fields -> a
     java.util.Set methods -> b
     boolean all -> c
     1:5:void <init>():52:56 -> <init>
     6:6:void <init>(com.android.tools.r8.dex.CodeToKeep$1):52:52 -> <init>
-com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.internal.Hb:
+com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.internal.Gb:
     1:1:void <init>():214:214 -> <init>
     boolean isNop() -> a
     void recordClass(com.android.tools.r8.graph.DexType) -> a
@@ -20186,7 +20061,7 @@
     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):238:238 -> a
-com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.sc:
     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
@@ -20254,12 +20129,12 @@
     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.zd:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.yd:
     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.ze:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.ye:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     java.nio.ByteBuffer buffer -> d
     com.android.tools.r8.graph.DexDebugInfoForWriting info -> c
@@ -20994,7 +20869,7 @@
     261:277:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1292:1308 -> l
     261:277:void populateMethodHandles():1019 -> l
     261:277:void populateIndexTables():1004 -> l
-    278:278:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2746:2746 -> l
+    278:278:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2744:2744 -> l
     278:278:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1308 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     278:278:void populateMethodHandles():1019 -> l
@@ -21135,7 +21010,7 @@
     2:2:java.lang.String typeName():33:33 -> toString
     2:2:java.lang.String toString():83 -> toString
     3:3:java.lang.String toString():83:83 -> toString
-com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.internal.qk:
+com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.internal.lk:
     com.android.tools.r8.graph.GraphLens graphLens -> d
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.graph.DexApplication application -> b
@@ -21168,7 +21043,7 @@
     16:16:int lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):132 -> a
     17:35:com.android.tools.r8.dex.FileWriter collect():143:161 -> a
     36:36:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):268:268 -> a
-    37:37:boolean com.android.tools.r8.graph.DexItemFactory.isClassConstructor(com.android.tools.r8.graph.DexMethod):2860:2860 -> a
+    37:37:boolean com.android.tools.r8.graph.DexItemFactory.isClassConstructor(com.android.tools.r8.graph.DexMethod):2858:2858 -> a
     37:37:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):268 -> a
     38:42:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):271:275 -> a
     43:55:void checkInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):274:286 -> a
@@ -21470,12 +21345,12 @@
     33:33:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):478:478 -> c
     34:36:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):477:479 -> c
     37:37:int lambda$writeAnnotationDirectory$5(com.android.tools.r8.graph.DexEncodedMethod):623:623 -> c
-com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.internal.mk:
+com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.internal.hk:
     com.android.tools.r8.dex.CompatByteBuffer buffer -> a
     int length -> b
     1:1:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int,com.android.tools.r8.dex.FileWriter$1):87:87 -> <init>
     2:4:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int):93:95 -> <init>
-com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.internal.nk:
+com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.internal.ik:
     int annotationSetsOffset -> n
     int annotationSetRefListsOffset -> o
     int stringDataOffsets -> l
@@ -21530,7 +21405,7 @@
     3:4:void setStringDataOffsets(int):974:975 -> l
     1:2:int getTypeListsOffset():959:960 -> m
     3:4:void setTypeListsOffset(int):964:965 -> m
-com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.internal.ok:
+com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.internal.jk:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap debugInfos -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap typeLists -> c
@@ -21568,37 +21443,37 @@
     29:29:boolean add(com.android.tools.r8.graph.DexString):1185:1185 -> a
     30:31:boolean com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,java.lang.Object):1113:1114 -> a
     30:31:boolean add(com.android.tools.r8.graph.DexString):1185 -> a
-    32:33:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1304:1305 -> a
-    34:34:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfoForWriting,int):1314:1314 -> a
-    35:35:void setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode,int):1318:1318 -> a
-    36:37:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
-    36:37:void setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode,int):1318 -> a
-    38:39:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1322:1323 -> a
-    40:40:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327:1327 -> a
-    41:42:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
-    41:42:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327 -> a
-    43:43:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1331:1331 -> a
-    44:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1337:1338 -> a
-    46:46:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1342:1342 -> a
-    47:47:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1346:1346 -> a
-    48:48:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1350:1350 -> a
-    49:50:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1354:1355 -> a
+    32:33:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1232:1233 -> a
+    34:35:void setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1304:1305 -> a
+    36:36:void setOffsetFor(com.android.tools.r8.graph.DexDebugInfoForWriting,int):1314:1314 -> a
+    37:37:void setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode,int):1318:1318 -> a
+    38:39:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
+    38:39:void setOffsetFor(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexWritableCode,int):1318 -> a
+    40:41:void setOffsetFor(com.android.tools.r8.graph.DexTypeList,int):1322:1323 -> a
+    42:42:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327:1327 -> a
+    43:44:void com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.setOffsetFor(java.lang.Object,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1309:1310 -> a
+    43:44:void setOffsetFor(com.android.tools.r8.graph.DexString,int):1327 -> a
+    45:45:void setOffsetFor(com.android.tools.r8.graph.DexAnnotation,int):1331:1331 -> a
+    46:47:void setOffsetFor(com.android.tools.r8.graph.DexAnnotationSet,int):1337:1338 -> a
+    48:48:void setOffsetForAnnotationsDirectory(com.android.tools.r8.graph.DexAnnotationDirectory,int):1342:1342 -> a
+    49:49:void setOffsetFor(com.android.tools.r8.graph.DexProgramClass,int):1346:1346 -> a
+    50:50:void setOffsetFor(com.android.tools.r8.graph.DexEncodedArray,int):1350:1350 -> a
+    51:52:void setOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList,int):1354:1355 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1095:1095 -> b
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.<init>():176:176 -> b
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1095 -> b
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap createReference2IntMap():1096:1096 -> b
     4:4:void visit(com.android.tools.r8.graph.DexEncodedMethod):1142:1142 -> b
-    5:6:int lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap):1232:1233 -> b
-    7:7:int getOffsetFor(com.android.tools.r8.graph.DexString):1247:1247 -> b
-    8:9:int com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1241:1242 -> b
-    8:9:int getOffsetFor(com.android.tools.r8.graph.DexString):1247 -> b
-    10:13:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1251:1254 -> b
-    14:14:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1258:1258 -> b
-    15:15:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1262:1262 -> b
-    16:16:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfoForWriting):1266:1266 -> b
-    17:17:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1280:1280 -> b
-    18:21:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1286:1289 -> b
-    22:25:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1293:1296 -> b
+    5:5:int getOffsetFor(com.android.tools.r8.graph.DexString):1247:1247 -> b
+    6:7:int com.android.tools.r8.dex.FileWriter$MixedSectionOffsets.lookup(java.lang.Object,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1241:1242 -> b
+    6:7:int getOffsetFor(com.android.tools.r8.graph.DexString):1247 -> b
+    8:11:int getOffsetFor(com.android.tools.r8.graph.DexTypeList):1251:1254 -> b
+    12:12:int getOffsetFor(com.android.tools.r8.graph.DexProgramClass):1258:1258 -> b
+    13:13:int getOffsetFor(com.android.tools.r8.graph.DexEncodedArray):1262:1262 -> b
+    14:14:int getOffsetFor(com.android.tools.r8.graph.DexDebugInfoForWriting):1266:1266 -> b
+    15:15:int getOffsetFor(com.android.tools.r8.graph.DexAnnotation):1280:1280 -> b
+    16:19:int getOffsetFor(com.android.tools.r8.graph.DexAnnotationSet):1286:1289 -> b
+    20:23:int getOffsetFor(com.android.tools.r8.graph.ParameterAnnotationsList):1293:1296 -> b
     1:1:java.util.Collection getAnnotationDirectories():1221:1221 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> c
     2:2:java.util.Collection getAnnotationDirectories():1221 -> c
@@ -21643,13 +21518,13 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> l
     2:2:java.util.Collection getTypeLists():1197 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.internal.pk:
+com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.internal.kk:
     java.util.Set includedClasses -> c
     com.android.tools.r8.dex.FileWriter this$0 -> d
     1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1363:1364 -> <init>
     3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1361:1365 -> <init>
     1:4:void visit(com.android.tools.r8.graph.DexClass):1376:1379 -> b
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.bp:
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.Uo:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addMethod(com.android.tools.r8.graph.DexMethod) -> a
@@ -21662,7 +21537,7 @@
     boolean addField(com.android.tools.r8.graph.DexField) -> b
     1:1:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):113:113 -> b
     2:2:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):121:121 -> b
-com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.internal.ip:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.internal.bp:
     java.util.Comparator DEX_PROGRAM_CLASS_COMPARATOR -> l
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.InitClassLens initClassLens -> i
@@ -21708,7 +21583,7 @@
     91:92:java.util.List com.android.tools.r8.dex.InheritanceClassInDexDistributor.getSortedCopy(java.util.Collection):693:694 -> a
     91:92:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):446 -> a
     93:95:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):446:448 -> a
-    96:96:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
+    96:96:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
     96:96:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):449 -> a
     97:104:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):450:457 -> a
     105:105:void com.android.tools.r8.dex.InheritanceClassInDexDistributor.markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> a
@@ -21754,7 +21629,7 @@
     623:623:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588 -> a
     624:629:void collectGroup(java.util.Collection,com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup,com.android.tools.r8.graph.DexProgramClass):588:593 -> a
     630:634:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):602:606 -> a
-    635:635:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
+    635:635:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
     635:635:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):608 -> a
     636:637:boolean assignAll(com.android.tools.r8.dex.VirtualFile,java.util.Collection):609:610 -> a
     638:638:void com.android.tools.r8.dex.InheritanceClassInDexDistributor.markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> a
@@ -21830,7 +21705,7 @@
     92:92:boolean com.android.tools.r8.dex.InheritanceClassInDexDistributor.hasDirectInheritanceInCollection(com.android.tools.r8.graph.DexProgramClass,java.util.Set):675:675 -> b
     92:92:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):640 -> b
     93:93:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):643:643 -> b
-    94:94:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> b
+    94:94:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> b
     94:94:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):644 -> b
     95:103:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):645:653 -> b
     104:104:void com.android.tools.r8.dex.InheritanceClassInDexDistributor.markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> b
@@ -21856,7 +21731,7 @@
     1:1:com.android.tools.r8.graph.InitClassLens access$200(com.android.tools.r8.dex.InheritanceClassInDexDistributor):45:45 -> c
     1:1:com.android.tools.r8.naming.NamingLens access$300(com.android.tools.r8.dex.InheritanceClassInDexDistributor):45:45 -> d
     1:1:com.android.tools.r8.dex.VirtualFile access$600(com.android.tools.r8.dex.InheritanceClassInDexDistributor):45:45 -> e
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$CategorizedInheritanceGroupWithMainDexDependency -> com.android.tools.r8.internal.fp:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$CategorizedInheritanceGroupWithMainDexDependency -> com.android.tools.r8.internal.Yo:
     com.android.tools.r8.dex.InheritanceClassInDexDistributor this$0 -> d
     java.util.Set dependentsOfMainDexIndependents -> c
     boolean $assertionsDisabled -> e
@@ -21908,7 +21783,7 @@
     62:62: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):59:59 -> a
     62:62:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222 -> a
     63:73:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):222:232 -> a
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup -> com.android.tools.r8.internal.gp:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup -> com.android.tools.r8.internal.Zo:
     com.android.tools.r8.dex.InheritanceClassInDexDistributor this$0 -> f
     boolean dependsOnMainDexClasses -> e
     int numberOfMethodIds -> d
@@ -21928,7 +21803,7 @@
     12:25:int compareTo(java.lang.Object):56 -> compareTo
     26:29:int com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup.compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):109:112 -> compareTo
     26:29:int compareTo(java.lang.Object):56 -> compareTo
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.internal.hp:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.internal.ap:
     java.util.Map directSubClasses -> a
     java.util.Set classes -> b
     boolean $assertionsDisabled -> c
@@ -21946,7 +21821,7 @@
     4:7: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
     8:9: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.Tv:
+com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.Mv:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.DexString firstJumboString -> b
     java.util.Map instructionTargets -> d
@@ -22019,10 +21894,10 @@
     381:412:com.android.tools.r8.graph.DexCode rewrite():123 -> a
     413:425:com.android.tools.r8.graph.DexCode rewrite():125:137 -> 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.Rv:
+com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.Kv:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():279:279 -> <clinit>
-com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.Sv:
+com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.Lv:
     com.android.tools.r8.code.Instruction start -> a
     com.android.tools.r8.code.Instruction end -> b
     boolean endsAfterLastInstruction -> c
@@ -22032,7 +21907,7 @@
     1:5:void replaceTarget(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):73:77 -> a
     6:6:int getStartOffset():82:82 -> a
     1:4:int getStartToEndDelta():86:89 -> b
-com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.LD:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.ED:
     com.android.tools.r8.dex.Marker$Tool tool -> b
     boolean $assertionsDisabled -> f
     java.lang.String D8_PREFIX -> c
@@ -22047,16 +21922,16 @@
     172:172:void <clinit>():54:54 -> <clinit>
     56:56:void <clinit>():54:54 -> <clinit>
     57:57:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":173,"2":174,"3":175}}
-    173:173:void <clinit>():55:55 -> <clinit>
-    174:174:void <clinit>():55:55 -> <clinit>
-    175:175:void <clinit>():55:55 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":170,"2":171,"3":172}}
+    170:170:void <clinit>():55:55 -> <clinit>
+    171:171:void <clinit>():55:55 -> <clinit>
+    172:172:void <clinit>():55:55 -> <clinit>
     112:112:void <clinit>():55:55 -> <clinit>
     113:113:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":176,"2":177,"3":178}}
-    176:176:void <clinit>():56:56 -> <clinit>
-    177:177:void <clinit>():56:56 -> <clinit>
-    178:178:void <clinit>():56:56 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":170,"2":171,"3":172}}
+    170:170:void <clinit>():56:56 -> <clinit>
+    171:171:void <clinit>():56:56 -> <clinit>
+    172:172:void <clinit>():56:56 -> <clinit>
     169:169:void <clinit>():56:56 -> <clinit>
     1:1:void <init>(com.android.tools.r8.dex.Marker$Tool):62:62 -> <init>
     2:4:void <init>(com.android.tools.r8.dex.Marker$Tool,com.android.tools.r8.com.google.gson.JsonObject):65:67 -> <init>
@@ -22126,12 +22001,12 @@
     1:1:boolean isL8():132:132 -> n
     1:1:boolean isRelocator():136:136 -> o
     1:5:java.lang.String toString():274:278 -> toString
-com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.KD:
+com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.DD:
 # {"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.LD$a:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.ED$a:
     com.android.tools.r8.dex.Marker$Tool D8 -> b
     com.android.tools.r8.dex.Marker$Tool Relocator -> e
     com.android.tools.r8.dex.Marker$Tool L8 -> d
@@ -22139,7 +22014,7 @@
     1:4:void <clinit>():37:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):36:36 -> <init>
     1:1:com.android.tools.r8.dex.Marker$Tool[] valuesR8andD8():43:43 -> a
-com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.internal.mF:
+com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.internal.fF:
     1:1:void <init>():27:27 -> <init>
     boolean add(com.android.tools.r8.graph.DexAnnotation) -> a
     boolean add(com.android.tools.r8.graph.DexAnnotationSet) -> a
@@ -22151,7 +22026,7 @@
     boolean add(com.android.tools.r8.graph.DexDebugInfoForWriting) -> a
     boolean setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> b
-com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.NS:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.DS:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -22192,31 +22067,31 @@
     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.HS:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.xS:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):420:420 -> <init>
     1:1:boolean isRenamingCandidate(int,int):425:425 -> b
-com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.IS:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.yS:
     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.JS:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.zS:
     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
     2:2:boolean handlePrefix(int,int):374:374 -> a
     char getClassNameSeparator() -> b
     1:2:boolean isRenamingCandidate(int,int):380:381 -> b
-com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.KS:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.AS:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):391:391 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):406:406 -> a
     2:5:boolean handlePrefix(int,int):411:414 -> a
     6:6:boolean handlePrefix(int,int):412:412 -> a
     char getClassNameSeparator() -> b
-com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.LS:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.BS:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):431:431 -> <init>
     char getClassNameSeparator() -> b
     1:1:boolean isRenamingCandidate(int,int):446:446 -> b
-com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.MS:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.CS:
     java.lang.StringBuilder result -> b
     java.lang.String contents -> a
     int outputFrom -> d
@@ -22378,133 +22253,131 @@
     15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> f
     15:15:void setByteOrder():87 -> f
     16:16:void setByteOrder():87:87 -> f
-com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.internal.b20:
+com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.internal.R10:
     com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection indexedItems -> b
-    com.android.tools.r8.graph.ObjectToOffsetMapping objectMapping -> g
-    com.android.tools.r8.debuginfo.DebugRepresentation debugRepresentation -> f
+    com.android.tools.r8.graph.ObjectToOffsetMapping objectMapping -> f
+    boolean $assertionsDisabled -> g
     com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction transaction -> c
     com.android.tools.r8.graph.DexProgramClass primaryClass -> e
-    boolean $assertionsDisabled -> h
     com.android.tools.r8.FeatureSplit featureSplit -> d
     int id -> a
-    1:1:void <clinit>():61:61 -> <clinit>
-    1:1:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.dex.VirtualFile$1):61:61 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):85:85 -> <init>
-    3:3:void <init>(int,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.FeatureSplit):95:95 -> <init>
-    4:4:void <init>(int,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.graph.DexProgramClass):105:105 -> <init>
-    5:105:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.FeatureSplit):115:215 -> <init>
-    106:111:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.FeatureSplit):116:121 -> <init>
-    1:1:java.util.Map access$1100(java.util.Collection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.ClassNameMapper):61:61 -> a
-    2:2:com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction access$1200(com.android.tools.r8.dex.VirtualFile):61:61 -> a
-    3:5:void setDebugRepresentation(com.android.tools.r8.debuginfo.DebugRepresentation):146:148 -> a
-    6:8:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:159 -> a
-    9:9:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":518,"3":519}}
-    518:518:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):162:162 -> a
-    519:519:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):162:162 -> a
-    173:184:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:175 -> a
-    185:185:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):170:170 -> a
-    186:186:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
-    187:187:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":524,"2":525,"3":526,"4":527,"5":528,"6":529}}
-    524:524:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
-    525:525:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
-    526:526:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
-    527:527:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
-    528:528:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
-    529:529:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
-    354:354:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
-    355:355:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):160:160 -> a
-    356:356:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":530,"2":531,"3":532,"4":533,"5":534,"6":535}}
-    530:530:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):160:160 -> a
-    531:531:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):160:160 -> a
-    532:532:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):160:160 -> a
-    533:533:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):160:160 -> a
-    534:534:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):160:160 -> a
-    535:535:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):160:160 -> a
-    516:516:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):160:160 -> a
-    536:539:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):191:194 -> a
-    540:540:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):192:192 -> a
-    541:557:void computeMapping(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.InitClassLens,int,com.android.tools.r8.utils.Timing):229:245 -> a
-    558:558:void addClass(com.android.tools.r8.graph.DexProgramClass):251:251 -> a
-    559:560:boolean isFull(int):255:256 -> a
-    561:561:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    561:561:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):276 -> a
-    562:565:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):279:279 -> a
-    566:566:void abortTransaction():289:289 -> a
-    567:567:boolean containsString(com.android.tools.r8.graph.DexString):297:297 -> a
-    568:568:boolean containsType(com.android.tools.r8.graph.DexType):301:301 -> a
-    1:1:int access$1300(com.android.tools.r8.dex.VirtualFile):61:61 -> b
-    2:2:void injectString(com.android.tools.r8.graph.DexString):182:182 -> b
-    3:3:void com.android.tools.r8.dex.VirtualFile.commitTransaction():293:293 -> b
-    3:3:void injectString(com.android.tools.r8.graph.DexString):183 -> b
-    4:5:java.util.Map computeOriginalNameMapping(java.util.Collection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.ClassNameMapper):188:189 -> b
-    6:6:java.util.Collection classes():309:309 -> b
-    1:1:void commitTransaction():293:293 -> c
-    1:4:java.util.Set getClassDescriptors():129:132 -> d
-    1:2:com.android.tools.r8.debuginfo.DebugRepresentation getDebugRepresentation():152:153 -> e
-    1:1:com.android.tools.r8.FeatureSplit getFeatureSplit():138:138 -> f
-    1:1:int getId():125:125 -> g
-    1:1:int getNumberOfClasses():272:272 -> h
-    1:1:int getNumberOfFields():268:268 -> i
-    1:1:int getNumberOfMethods():264:264 -> j
-    1:2:com.android.tools.r8.graph.ObjectToOffsetMapping getObjectMapping():218:219 -> k
-    1:1:java.lang.String getPrimaryClassDescriptor():142:142 -> l
-    1:1:boolean isEmpty():305:305 -> m
-com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.internal.S10:
+    1:1:void <clinit>():60:60 -> <clinit>
+    1:1:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.dex.VirtualFile$1):60:60 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):93:93 -> <init>
+    3:3:void <init>(int,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.FeatureSplit):103:103 -> <init>
+    4:4:void <init>(int,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.graph.DexProgramClass):113:113 -> <init>
+    5:94:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.FeatureSplit):123:212 -> <init>
+    95:100:void <init>(int,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.graph.DexProgramClass,com.android.tools.r8.FeatureSplit):124:129 -> <init>
+    1:1:java.util.Map access$1100(java.util.Collection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.ClassNameMapper):60:60 -> a
+    2:2:com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction access$1200(com.android.tools.r8.dex.VirtualFile):60:60 -> a
+    3:5:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):154:156 -> a
+    6:6:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":506,"3":507}}
+    506:506:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):159:159 -> a
+    507:507:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):159:159 -> a
+    167:178:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):161:172 -> a
+    179:179:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):167:167 -> a
+    180:180:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    181:181:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":512,"2":513,"3":514,"4":515,"5":516,"6":517}}
+    512:512:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    513:513:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    514:514:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    515:515:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    516:516:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    517:517:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    345:345:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):164:164 -> a
+    346:346:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    347:347:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":518,"2":519,"3":520,"4":521,"5":522,"6":523}}
+    518:518:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    519:519:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    520:520:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    521:521:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    522:522:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    523:523:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    504:504:java.lang.String deriveCommonPrefixAndSanityCheck(java.util.List):157:157 -> a
+    524:527:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):188:191 -> a
+    528:528:void lambda$computeOriginalNameMapping$0(com.android.tools.r8.graph.GraphLens,java.util.Map,com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexProgramClass):189:189 -> a
+    529:545:void computeMapping(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.InitClassLens,int,com.android.tools.r8.utils.Timing):226:242 -> a
+    546:546:void addClass(com.android.tools.r8.graph.DexProgramClass):248:248 -> a
+    547:548:boolean isFull(int):252:253 -> a
+    549:549:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    549:549:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):273 -> a
+    550:553:void throwIfFull(boolean,com.android.tools.r8.utils.Reporter):276:276 -> a
+    554:554:void abortTransaction():286:286 -> a
+    555:555:boolean containsString(com.android.tools.r8.graph.DexString):294:294 -> a
+    556:556:boolean containsType(com.android.tools.r8.graph.DexType):298:298 -> a
+    1:1:int access$1300(com.android.tools.r8.dex.VirtualFile):60:60 -> b
+    2:2:void injectString(com.android.tools.r8.graph.DexString):179:179 -> b
+    3:3:void com.android.tools.r8.dex.VirtualFile.commitTransaction():290:290 -> b
+    3:3:void injectString(com.android.tools.r8.graph.DexString):180 -> b
+    4:5:java.util.Map computeOriginalNameMapping(java.util.Collection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.ClassNameMapper):185:186 -> b
+    6:6:java.util.Collection classes():306:306 -> b
+    1:1:void commitTransaction():290:290 -> c
+    1:4:java.util.Set getClassDescriptors():137:140 -> d
+    1:1:com.android.tools.r8.FeatureSplit getFeatureSplit():146:146 -> e
+    1:1:int getId():133:133 -> f
+    1:1:int getNumberOfClasses():269:269 -> g
+    1:1:int getNumberOfFields():265:265 -> h
+    1:1:int getNumberOfMethods():261:261 -> i
+    1:2:com.android.tools.r8.graph.ObjectToOffsetMapping getObjectMapping():215:216 -> j
+    1:1:java.lang.String getPrimaryClassDescriptor():150:150 -> k
+    1:1:boolean isEmpty():302:302 -> l
+com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.internal.I10:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List virtualFiles -> c
     com.android.tools.r8.dex.ApplicationWriter writer -> b
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter):317:317 -> <init>
-    2:6:void <init>(com.android.tools.r8.dex.ApplicationWriter):315:319 -> <init>
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter):314:314 -> <init>
+    2:6:void <init>(com.android.tools.r8.dex.ApplicationWriter):312:316 -> <init>
     java.util.List run() -> a
-com.android.tools.r8.dex.VirtualFile$DistributorBase -> com.android.tools.r8.internal.T10:
+com.android.tools.r8.dex.VirtualFile$DistributorBase -> com.android.tools.r8.internal.J10:
     com.android.tools.r8.dex.VirtualFile mainDexFile -> f
     java.util.Set classes -> d
     com.android.tools.r8.utils.InternalOptions options -> g
     boolean $assertionsDisabled -> h
     java.util.Map originalNames -> e
-    1:1:void <clinit>():382:382 -> <clinit>
-    1:15:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):389:403 -> <init>
-    16:16:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):402:402 -> <init>
-    1:5:void addMarkers(com.android.tools.r8.dex.VirtualFile):407:411 -> a
-    6:20:void fillForMainDexList(java.util.Set):416:430 -> a
+    1:1:void <clinit>():379:379 -> <clinit>
+    1:15:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):386:400 -> <init>
+    16:16:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):399:399 -> <init>
+    1:5:void addMarkers(com.android.tools.r8.dex.VirtualFile):404:408 -> a
+    6:20:void fillForMainDexList(java.util.Set):413:427 -> a
     21:21:void fillForMainDexList(java.util.Set):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":466,"2":467,"3":468}}
-    466:466:void fillForMainDexList(java.util.Set):431:431 -> a
-    467:467:void fillForMainDexList(java.util.Set):431:431 -> a
-    468:468:void fillForMainDexList(java.util.Set):431:431 -> a
-    453:453:void fillForMainDexList(java.util.Set):432:432 -> a
-    454:457:void fillForMainDexList(java.util.Set):431:434 -> a
-    458:461:void fillForMainDexList(java.util.Set):433:436 -> a
-    462:465:void fillForMainDexList(java.util.Set):435:438 -> a
-    469:474:void lambda$fillForMainDexList$0(com.android.tools.r8.dex.VirtualFile,java.util.Set,com.android.tools.r8.graph.DexType):423:428 -> a
-    475:501:java.util.TreeSet sortClassesByPackage(java.util.Set,java.util.Map):443:469 -> a
-    502:524:int lambda$sortClassesByPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):445:467 -> a
-    525:556:void addFeatureSplitFiles(java.util.Map):498:529 -> a
-    1:17:java.util.Map removeFeatureSplitClassesGetMapping():474:490 -> b
-com.android.tools.r8.dex.VirtualFile$FilePerInputClassDistributor -> com.android.tools.r8.internal.U10:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465}}
+    463:463:void fillForMainDexList(java.util.Set):428:428 -> a
+    464:464:void fillForMainDexList(java.util.Set):428:428 -> a
+    465:465:void fillForMainDexList(java.util.Set):428:428 -> a
+    450:450:void fillForMainDexList(java.util.Set):429:429 -> a
+    451:454:void fillForMainDexList(java.util.Set):428:431 -> a
+    455:458:void fillForMainDexList(java.util.Set):430:433 -> a
+    459:462:void fillForMainDexList(java.util.Set):432:435 -> a
+    466:471:void lambda$fillForMainDexList$0(com.android.tools.r8.dex.VirtualFile,java.util.Set,com.android.tools.r8.graph.DexType):420:425 -> a
+    472:498:java.util.TreeSet sortClassesByPackage(java.util.Set,java.util.Map):440:466 -> a
+    499:521:int lambda$sortClassesByPackage$1(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):442:464 -> a
+    522:554:void addFeatureSplitFiles(java.util.Map,com.android.tools.r8.dex.VirtualFile$FillStrategy):501:533 -> a
+    1:17:java.util.Map removeFeatureSplitClassesGetMapping():471:487 -> b
+com.android.tools.r8.dex.VirtualFile$FilePerInputClassDistributor -> com.android.tools.r8.internal.K10:
     boolean $assertionsDisabled -> e
     boolean combineSyntheticClassesWithPrimaryClass -> d
-    1:1:void <clinit>():331:331 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.dex.ApplicationWriter,boolean):336:337 -> <init>
-    1:8:java.util.List run():342:349 -> a
+    1:1:void <clinit>():328:328 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.dex.ApplicationWriter,boolean):333:334 -> <init>
+    1:8:java.util.List run():339:346 -> a
     9:9:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269:269 -> a
-    9:9:java.util.List run():349 -> a
+    9:9:java.util.List run():346 -> a
     10:10:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):265:265 -> a
     10:10:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269 -> a
-    10:10:java.util.List run():349 -> a
-    11:11:java.util.List run():365:365 -> a
-    12:40:java.util.List run():350:378 -> a
-com.android.tools.r8.dex.VirtualFile$FillFilesDistributor -> com.android.tools.r8.internal.V10:
-    boolean $assertionsDisabled -> j
-    java.util.concurrent.ExecutorService executorService -> i
-    1:1:void <clinit>():534:534 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):539:540 -> <init>
-    1:57:java.util.List run():545:601 -> a
-    1:1:int lambda$run$0(com.android.tools.r8.dex.VirtualFile):600:600 -> b
-com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.internal.W10:
+    10:10:java.util.List run():346 -> a
+    11:11:java.util.List run():362:362 -> a
+    12:40:java.util.List run():347:375 -> a
+com.android.tools.r8.dex.VirtualFile$FillFilesDistributor -> com.android.tools.r8.internal.L10:
+    com.android.tools.r8.dex.VirtualFile$FillStrategy fillStrategy -> i
+    java.util.concurrent.ExecutorService executorService -> j
+    boolean $assertionsDisabled -> k
+    1:1:void <clinit>():538:538 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):544:546 -> <init>
+    1:58:java.util.List run():551:608 -> a
+    1:1:int lambda$run$0(com.android.tools.r8.dex.VirtualFile):607:607 -> b
+com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.internal.M10:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils rewriter -> e
     boolean $assertionsDisabled -> n
     com.android.tools.r8.naming.NamingLens namingLens -> d
@@ -22519,178 +22392,131 @@
     java.util.Set callSites -> l
     com.android.tools.r8.graph.GraphLens graphLens -> b
     java.util.Set methodHandles -> m
-    1:1:void <clinit>():733:733 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,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.dex.VirtualFile$1):733:733 -> <init>
-    2:2:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):755:755 -> <init>
-    3:22:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):741:760 -> <init>
-    1:1:java.util.Set access$1500(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):733:733 -> a
-    2:5:boolean maybeInsert(com.android.tools.r8.graph.DexItem,java.util.Set,java.util.Set):764:767 -> a
-    6:6:boolean addClass(com.android.tools.r8.graph.DexProgramClass):777:777 -> a
-    7:7:boolean addMethod(com.android.tools.r8.graph.DexMethod):787:787 -> a
-    8:8:boolean addString(com.android.tools.r8.graph.DexString):792:792 -> a
-    9:9:boolean addProto(com.android.tools.r8.graph.DexProto):797:797 -> a
-    10:10:boolean addType(com.android.tools.r8.graph.DexType):802:802 -> a
+    1:1:void <clinit>():740:740 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,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.dex.VirtualFile$1):740:740 -> <init>
+    2:2:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):762:762 -> <init>
+    3:22:void <init>(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):748:767 -> <init>
+    1:1:java.util.Set access$1500(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):740:740 -> a
+    2:5:boolean maybeInsert(com.android.tools.r8.graph.DexItem,java.util.Set,java.util.Set):771:774 -> a
+    6:6:boolean addClass(com.android.tools.r8.graph.DexProgramClass):784:784 -> a
+    7:7:boolean addMethod(com.android.tools.r8.graph.DexMethod):794:794 -> a
+    8:8:boolean addString(com.android.tools.r8.graph.DexString):799:799 -> a
+    9:9:boolean addProto(com.android.tools.r8.graph.DexProto):804:804 -> a
+    10:10:boolean addType(com.android.tools.r8.graph.DexType):809:809 -> a
     11:11:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):223:223 -> a
-    11:11:boolean addType(com.android.tools.r8.graph.DexType):802 -> a
-    12:12:boolean addType(com.android.tools.r8.graph.DexType):803:803 -> a
-    13:13:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):808:808 -> a
-    14:14:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):813:813 -> a
-    15:15:com.android.tools.r8.graph.InitClassLens getInitClassLens():823:823 -> a
-    16:16:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):839:839 -> a
-    17:21:void commitItemsIn(java.util.Set,java.util.function.Function):855:859 -> a
-    22:23:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):856:857 -> a
-    1:1:com.android.tools.r8.ir.conversion.LensCodeRewriterUtils access$200(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):733:733 -> b
-    2:2:void addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):772:772 -> b
-    3:3:boolean addField(com.android.tools.r8.graph.DexField):782:782 -> b
-    4:4:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):828:828 -> b
-    5:6:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):833:834 -> b
-    7:12:void abort():874:879 -> b
-    1:8:void commit():863:870 -> c
-    1:1:int getNumberOfClasses():847:847 -> d
-    1:1:int getNumberOfFields():851:851 -> e
-    1:1:int getNumberOfMethods():843:843 -> f
-    1:2:boolean isEmpty():883:884 -> g
-com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.internal.X10:
-    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):607:607 -> <init>
-    1:14:java.util.List run():613:626 -> a
-com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.internal.Y10:
+    11:11:boolean addType(com.android.tools.r8.graph.DexType):809 -> a
+    12:12:boolean addType(com.android.tools.r8.graph.DexType):810:810 -> a
+    13:13:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):815:815 -> a
+    14:14:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):820:820 -> a
+    15:15:com.android.tools.r8.graph.InitClassLens getInitClassLens():830:830 -> a
+    16:16:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):846:846 -> a
+    17:21:void commitItemsIn(java.util.Set,java.util.function.Function):862:866 -> a
+    22:23:void lambda$commitItemsIn$0(java.util.function.Function,com.android.tools.r8.graph.DexItem):863:864 -> a
+    1:1:com.android.tools.r8.ir.conversion.LensCodeRewriterUtils access$200(com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction):740:740 -> b
+    2:2:void addClassAndDependencies(com.android.tools.r8.graph.DexProgramClass):779:779 -> b
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):789:789 -> b
+    4:4:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):835:835 -> b
+    5:6:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):840:841 -> b
+    7:12:void abort():881:886 -> b
+    1:8:void commit():870:877 -> c
+    1:1:int getNumberOfClasses():854:854 -> d
+    1:1:int getNumberOfFields():858:858 -> e
+    1:1:int getNumberOfMethods():850:850 -> f
+    1:2:boolean isEmpty():890:891 -> g
+com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.internal.N10:
+    1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.utils.InternalOptions):614:614 -> <init>
+    1:9:java.util.List run():620:628 -> a
+    10:10:void com.android.tools.r8.dex.VirtualFile$DistributorBase.addFeatureSplitFiles(java.util.Map):495:495 -> a
+    10:10:java.util.List run():630 -> a
+    11:11:java.util.List run():633:633 -> a
+com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.internal.O10:
     java.util.List classes -> a
     java.util.Map originalNames -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
-    com.android.tools.r8.utils.InternalOptions options -> d
-    boolean $assertionsDisabled -> f
-    com.android.tools.r8.dex.VirtualFile$VirtualFileCycler cycler -> e
-    1:1:void <clinit>():1007:1007 -> <clinit>
-    1:6:void <init>(java.util.List,com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,int,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):1036:1041 -> <init>
-    1:5:java.util.Map call():1068:1072 -> a
-    6:6:java.lang.String com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getOriginalName(com.android.tools.r8.graph.DexProgramClass):1059:1059 -> a
-    6:6:java.util.Map call():1073 -> a
-    7:11:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.coveredByPrefix(java.lang.String,java.lang.String):1050:1054 -> a
-    7:11:java.util.Map call():1074 -> a
-    12:32:java.util.Map call():1076:1096 -> a
-    33:35:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):205:207 -> a
-    33:35:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):61 -> a
-    33:35:java.util.Map call():1096 -> a
-    36:38:java.util.Map call():1097:1099 -> a
-    39:41:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):205:207 -> a
-    39:41:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):61 -> a
-    39:41:java.util.Map call():1100 -> a
+    com.android.tools.r8.dex.VirtualFile$FillStrategy fillStrategy -> d
+    com.android.tools.r8.utils.InternalOptions options -> e
+    boolean $assertionsDisabled -> g
+    com.android.tools.r8.dex.VirtualFile$VirtualFileCycler cycler -> f
+    1:1:void <clinit>():1014:1014 -> <clinit>
+    1:7:void <init>(java.util.List,com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.dex.VirtualFile$FillStrategy,int,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions):1045:1051 -> <init>
+    1:5:java.util.Map call():1078:1082 -> a
+    6:6:java.lang.String com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getOriginalName(com.android.tools.r8.graph.DexProgramClass):1069:1069 -> a
+    6:6:java.util.Map call():1083 -> a
+    7:11:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.coveredByPrefix(java.lang.String,java.lang.String):1060:1064 -> a
+    7:11:java.util.Map call():1084 -> a
+    12:32:java.util.Map call():1086:1106 -> a
+    33:35:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):202:204 -> a
+    33:35:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
+    33:35:java.util.Map call():1106 -> a
+    36:38:java.util.Map call():1107:1109 -> a
+    39:41:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):202:204 -> a
+    39:41:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
+    39:41:java.util.Map call():1110 -> a
     42:42:java.util.Map call():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1271,"2":1272,"3":1273,"4":1274,"5":1275}}
-    1271:1271:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):210:210 -> a
-    1271:1271:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):61 -> a
-    1271:1271:java.util.Map call():1100 -> a
-    1272:1272:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):210:210 -> a
-    1272:1272:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):61 -> a
-    1272:1272:java.util.Map call():1100 -> a
-    1273:1273:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):210:210 -> a
-    1273:1273:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):61 -> a
-    1273:1273:java.util.Map call():1100 -> a
-    1274:1274:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):210:210 -> a
-    1274:1274:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):61 -> a
-    1274:1274:java.util.Map call():1100 -> a
-    1275:1275:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):210:210 -> a
-    1275:1275:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):61 -> a
-    1275:1275:java.util.Map call():1100 -> a
-    1147:1156:java.util.Map call():1105:1114 -> a
-    1157:1158:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1159:1160 -> a
-    1157:1158:java.util.Map call():1114 -> a
-    1159:1159:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    1159:1159:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1163 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1267,"2":1268,"3":1269,"4":1270,"5":1271}}
+    1267:1267:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
+    1267:1267:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
+    1267:1267:java.util.Map call():1110 -> a
+    1268:1268:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
+    1268:1268:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
+    1268:1268:java.util.Map call():1110 -> a
+    1269:1269:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
+    1269:1269:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
+    1269:1269:java.util.Map call():1110 -> a
+    1270:1270:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
+    1270:1270:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
+    1270:1270:java.util.Map call():1110 -> a
+    1271:1271:java.lang.String com.android.tools.r8.dex.VirtualFile.extractPrefixToken(int,java.lang.String,boolean):207:207 -> a
+    1271:1271:java.lang.String com.android.tools.r8.dex.VirtualFile.access$1400(int,java.lang.String,boolean):60 -> a
+    1271:1271:java.util.Map call():1110 -> a
+    1157:1196:java.util.Map call():1115:1154 -> a
+    1197:1242:java.util.Map call():1118:1163 -> a
+    1243:1247:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1178:1182 -> a
+    1243:1247:java.util.Map call():1163 -> a
+    1248:1248:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):282:282 -> a
+    1248:1248:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1159:1159:java.util.Map call():1114 -> a
-    1160:1189:java.util.Map call():1115:1144 -> a
-    1190:1235:java.util.Map call():1108:1153 -> a
-    1236:1239:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1168:1171 -> a
-    1236:1239:java.util.Map call():1153 -> a
-    1240:1240:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    1240:1240:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1172 -> a
+    1248:1248:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1182 -> a
+    1248:1248:java.util.Map call():1163 -> a
+    1249:1251:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1203:1205 -> a
+    1249:1251:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1183 -> a
+    1249:1251:java.util.Map call():1163 -> a
+    1252:1252:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1185:1185 -> a
+    1252:1252:java.util.Map call():1163 -> a
+    1253:1253:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    1253:1253:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1186 -> a
+    1253:1253:java.util.Map call():1163 -> a
+    1254:1254:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1188:1188 -> a
+    1254:1254:java.util.Map call():1163 -> a
+    1255:1257:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1203:1205 -> a
+    1255:1257:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1189 -> a
+    1255:1257:java.util.Map call():1163 -> a
+    1258:1259:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1190:1191 -> a
+    1258:1259:java.util.Map call():1163 -> a
+    1260:1260:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    1260:1260:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1192 -> a
+    1260:1260:java.util.Map call():1163 -> a
+    1261:1261:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
+    1261:1261:java.util.Map call():1163 -> a
+    1262:1262:java.util.Map call():0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1272,"2":1273,"3":1274}}
+    1272:1272:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
+    1272:1272:java.util.Map call():1163 -> a
+    1273:1273:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
+    1273:1273:java.util.Map call():1163 -> a
+    1274:1274:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1193:1193 -> a
+    1274:1274:java.util.Map call():1163 -> a
+    1263:1266:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1194:1197 -> a
+    1263:1266:java.util.Map call():1163 -> a
+    1275:1279:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1169:1173 -> a
+    1280:1280:boolean com.android.tools.r8.dex.VirtualFile.isFilledEnough(com.android.tools.r8.dex.VirtualFile$FillStrategy):282:282 -> a
+    1280:1280:boolean com.android.tools.r8.dex.VirtualFile.access$1600(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.dex.VirtualFile$FillStrategy):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1240:1240:java.util.Map call():1153 -> a
-    1241:1241:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1193:1193 -> a
-    1241:1241:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1173 -> a
-    1241:1241:java.util.Map call():1153 -> a
-    1242:1243:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1159:1160 -> a
-    1242:1243:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1193 -> a
-    1242:1243:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1173 -> a
-    1242:1243:java.util.Map call():1153 -> a
-    1244:1244:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    1244:1244:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1163 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1244:1244:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1193 -> a
-    1244:1244:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1173 -> a
-    1244:1244:java.util.Map call():1153 -> a
-    1245:1245:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1194:1194 -> a
-    1245:1245:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1173 -> a
-    1245:1245:java.util.Map call():1153 -> a
-    1246:1247:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1159:1160 -> a
-    1246:1247:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1194 -> a
-    1246:1247:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1173 -> a
-    1246:1247:java.util.Map call():1153 -> a
-    1248:1248:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    1248:1248:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1163 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1248:1248:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1194 -> a
-    1248:1248:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1173 -> a
-    1248:1248:java.util.Map call():1153 -> a
-    1249:1249:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1195:1195 -> a
-    1249:1249:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1173 -> a
-    1249:1249:java.util.Map call():1153 -> a
-    1250:1250:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1175:1175 -> a
-    1250:1250:java.util.Map call():1153 -> a
-    1251:1251:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    1251:1251:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1176 -> a
-    1251:1251:java.util.Map call():1153 -> a
-    1252:1252:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1178:1178 -> a
-    1252:1252:java.util.Map call():1153 -> a
-    1253:1253:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1193:1193 -> a
-    1253:1253:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1179 -> a
-    1253:1253:java.util.Map call():1153 -> a
-    1254:1255:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1159:1160 -> a
-    1254:1255:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1193 -> a
-    1254:1255:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1179 -> a
-    1254:1255:java.util.Map call():1153 -> a
-    1256:1256:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    1256:1256:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1163 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1256:1256:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1193 -> a
-    1256:1256:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1179 -> a
-    1256:1256:java.util.Map call():1153 -> a
-    1257:1257:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1194:1194 -> a
-    1257:1257:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1179 -> a
-    1257:1257:java.util.Map call():1153 -> a
-    1258:1259:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1159:1160 -> a
-    1258:1259:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1194 -> a
-    1258:1259:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1179 -> a
-    1258:1259:java.util.Map call():1153 -> a
-    1260:1260:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    1260:1260:boolean com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1163 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1260:1260:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1194 -> a
-    1260:1260:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1179 -> a
-    1260:1260:java.util.Map call():1153 -> a
-    1261:1261:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.getVirtualFile(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler):1195:1195 -> a
-    1261:1261:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1179 -> a
-    1261:1261:java.util.Map call():1153 -> a
-    1262:1263:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1180:1181 -> a
-    1262:1263:java.util.Map call():1153 -> a
-    1264:1264:boolean com.android.tools.r8.dex.VirtualFile.isFull():260:260 -> a
-    1264:1264:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1182 -> a
-    1264:1264:java.util.Map call():1153 -> a
-    1265:1265:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1183:1183 -> a
-    1265:1265:java.util.Map call():1153 -> a
-    1266:1266:java.util.Map call():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1276,"2":1277,"3":1278}}
-    1276:1276:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1183:1183 -> a
-    1276:1276:java.util.Map call():1153 -> a
-    1277:1277:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1183:1183 -> a
-    1277:1277:java.util.Map call():1153 -> a
-    1278:1278:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1183:1183 -> a
-    1278:1278:java.util.Map call():1153 -> a
-    1267:1270:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1184:1187 -> a
-    1267:1270:java.util.Map call():1153 -> a
-    1:1:java.lang.Object call():1007:1007 -> call
-com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.internal.Z10:
+    1280:1280:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1173 -> a
+    1281:1281:boolean com.android.tools.r8.dex.VirtualFile.isFull():257:257 -> a
+    1281:1281:boolean isFullEnough(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.InternalOptions):1173 -> a
+    1:1:java.lang.Object call():1014:1014 -> call
+com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.internal.P10:
     java.util.List files -> a
     com.android.tools.r8.FeatureSplit featuresplit -> i
     com.android.tools.r8.graph.AppView appView -> b
@@ -22701,20 +22527,20 @@
     java.util.Iterator allFilesCyclic -> g
     com.android.tools.r8.graph.GraphLens graphLens -> c
     com.android.tools.r8.graph.InitClassLens initClassLens -> d
-    1:1:void <clinit>():900:900 -> <clinit>
-    1:13:void <init>(java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,int):919:931 -> <init>
-    1:1:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():940:940 -> a
-    1:1:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.nextOrCreate():951 -> a
-    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):971 -> a
-    2:8:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.nextOrCreate():952:958 -> a
-    2:8:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):971 -> a
-    9:12:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):972:975 -> a
-    13:18:com.android.tools.r8.dex.VirtualFile addFile():987:992 -> a
-    1:1:boolean hasNext():940:940 -> b
-    1:1:com.android.tools.r8.dex.VirtualFile next():944:944 -> c
-    1:2:void reset():935:936 -> d
-    1:1:void restart():983:983 -> e
-com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.internal.a20:
+    1:1:void <clinit>():907:907 -> <clinit>
+    1:13:void <init>(java.util.List,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,int):926:938 -> <init>
+    1:1:boolean com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.hasNext():947:947 -> a
+    1:1:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.nextOrCreate():958 -> a
+    1:1:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):978 -> a
+    2:8:com.android.tools.r8.dex.VirtualFile com.android.tools.r8.dex.VirtualFile$VirtualFileCycler.nextOrCreate():959:965 -> a
+    2:8:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):978 -> a
+    9:12:com.android.tools.r8.dex.VirtualFile nextOrCreate(java.util.function.Predicate):979:982 -> a
+    13:18:com.android.tools.r8.dex.VirtualFile addFile():994:999 -> a
+    1:1:boolean hasNext():947:947 -> b
+    1:1:com.android.tools.r8.dex.VirtualFile next():951:951 -> c
+    1:2:void reset():942:943 -> d
+    1:1:void restart():990:990 -> e
+com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.internal.Q10:
     java.util.Set methods -> g
     java.util.Set fields -> h
     java.util.Set strings -> i
@@ -22727,38 +22553,38 @@
     java.util.Set methodHandles -> k
     com.android.tools.r8.graph.GraphLens graphLens -> a
     com.android.tools.r8.graph.InitClassLens initClassLens -> b
-    1:1:void <clinit>():630:630 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):646:646 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):636:649 -> <init>
-    1:1:java.util.Set access$100(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):630:630 -> a
-    2:2:boolean addClass(com.android.tools.r8.graph.DexProgramClass):654:654 -> a
-    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):664:664 -> a
-    4:4:boolean addString(com.android.tools.r8.graph.DexString):669:669 -> a
-    5:5:boolean addProto(com.android.tools.r8.graph.DexProto):674:674 -> a
-    6:6:boolean addType(com.android.tools.r8.graph.DexType):679:679 -> a
+    1:1:void <clinit>():637:637 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):653:653 -> <init>
+    2:15:void <init>(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens):643:656 -> <init>
+    1:1:java.util.Set access$100(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> a
+    2:2:boolean addClass(com.android.tools.r8.graph.DexProgramClass):661:661 -> a
+    3:3:boolean addMethod(com.android.tools.r8.graph.DexMethod):671:671 -> a
+    4:4:boolean addString(com.android.tools.r8.graph.DexString):676:676 -> a
+    5:5:boolean addProto(com.android.tools.r8.graph.DexProto):681:681 -> a
+    6:6:boolean addType(com.android.tools.r8.graph.DexType):686:686 -> a
     7:7:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):223:223 -> a
-    7:7:boolean addType(com.android.tools.r8.graph.DexType):679 -> a
-    8:8:boolean addType(com.android.tools.r8.graph.DexType):680:680 -> a
-    9:9:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):685:685 -> a
-    10:10:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):690:690 -> a
-    11:11:com.android.tools.r8.graph.InitClassLens getInitClassLens():712:712 -> a
-    12:12:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):729:729 -> a
+    7:7:boolean addType(com.android.tools.r8.graph.DexType):686 -> a
+    8:8:boolean addType(com.android.tools.r8.graph.DexType):687:687 -> a
+    9:9:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):692:692 -> a
+    10:10:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):697:697 -> a
+    11:11:com.android.tools.r8.graph.InitClassLens getInitClassLens():719:719 -> a
+    12:12:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):736:736 -> a
     13:13:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):468:468 -> a
-    13:13:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):729 -> a
+    13:13:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):736 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):729:729 -> a
-    1:1:java.util.Set access$300(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):630:630 -> b
-    2:2:boolean addField(com.android.tools.r8.graph.DexField):659:659 -> b
-    3:3:int getNumberOfFields():698:698 -> b
-    4:4:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):717:717 -> b
-    5:7:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):722:724 -> b
-    1:1:java.util.Set access$400(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):630:630 -> c
-    2:2:int getNumberOfMethods():694:694 -> c
-    1:1:java.util.Set access$500(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):630:630 -> d
-    1:1:java.util.Set access$600(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):630:630 -> e
-    1:1:java.util.Set access$700(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):630:630 -> f
-    1:1:java.util.Set access$800(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):630:630 -> g
-    1:1:java.util.Set access$900(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):630:630 -> h
+    14:14:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexField):736:736 -> a
+    1:1:java.util.Set access$300(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> b
+    2:2:boolean addField(com.android.tools.r8.graph.DexField):666:666 -> b
+    3:3:int getNumberOfFields():705:705 -> b
+    4:4:com.android.tools.r8.graph.DexString getRenamedDescriptor(com.android.tools.r8.graph.DexType):724:724 -> b
+    5:7:com.android.tools.r8.graph.DexString getRenamedName(com.android.tools.r8.graph.DexMethod):729:731 -> b
+    1:1:java.util.Set access$400(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> c
+    2:2:int getNumberOfMethods():701:701 -> c
+    1:1:java.util.Set access$500(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> d
+    1:1:java.util.Set access$600(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> e
+    1:1:java.util.Set access$700(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> f
+    1:1:java.util.Set access$800(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> g
+    1:1:java.util.Set access$900(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):637:637 -> h
 com.android.tools.r8.dexsplitter.DexSplitter -> com.android.tools.r8.dexsplitter.DexSplitter:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
@@ -22816,7 +22642,7 @@
     66:69:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):347:350 -> run
     66:69:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
     70:70:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):300:300 -> run
-com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.dh:
+com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.Yg:
     java.lang.String jar -> a
     java.lang.String outputName -> b
     1:3:void <init>(java.lang.String,java.lang.String):49:51 -> <init>
@@ -22875,16 +22701,16 @@
 com.android.tools.r8.dexsplitter.DexSplitter$ZipFileOrigin -> com.android.tools.r8.dexsplitter.b:
     1:1:void <init>(java.nio.file.Path):79:79 -> <init>
     1:1:java.lang.String part():0:0 -> part
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":170,"2":171,"3":172}}
-    170:170:java.lang.String part():84:84 -> part
-    171:171:java.lang.String part():84:84 -> part
-    172:172:java.lang.String part():84:84 -> part
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":87,"2":88,"3":89}}
+    87:87:java.lang.String part():84:84 -> part
+    88:88:java.lang.String part():84:84 -> part
+    89:89:java.lang.String part():84:84 -> part
     85:85:java.lang.String part():84:84 -> part
     86:86:java.lang.String part():0:0 -> part
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":173,"2":174,"3":175}}
-    173:173:java.lang.String part():84:84 -> part
-    174:174:java.lang.String part():84:84 -> part
-    175:175:java.lang.String part():84:84 -> part
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":87,"2":88,"3":89}}
+    87:87:java.lang.String part():84:84 -> part
+    88:88:java.lang.String part():84:84 -> part
+    89:89:java.lang.String part():84:84 -> part
 com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl -> com.android.tools.r8.diagnostic.internal.a:
     com.android.tools.r8.references.ClassReference classReference -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.origin.Origin,com.android.tools.r8.diagnostic.internal.DefinitionClassContextImpl$1):11:11 -> <init>
@@ -22976,32 +22802,32 @@
     3:3:boolean validate():55:55 -> c
     3:3:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():48 -> c
     4:4:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():49:49 -> c
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.aF:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.TE:
     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$Builder -> com.android.tools.r8.internal.ZE:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.SE:
     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.eF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.internal.XE:
     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.dF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.internal.WE:
     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.fF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.YE:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():26:28 -> <clinit>
@@ -23061,7 +22887,7 @@
     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.hF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.aF:
     java.util.Collection missingDefinitions -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
@@ -23078,33 +22904,33 @@
     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$Builder -> com.android.tools.r8.internal.gF:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.ZE:
     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.jF:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.internal.cF:
     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$Builder -> com.android.tools.r8.internal.iF:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.bF:
     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.lF:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl -> com.android.tools.r8.internal.eF:
     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$Builder -> com.android.tools.r8.internal.kF:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.dF:
     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>
@@ -23179,7 +23005,7 @@
     50:50:java.lang.String getDiagnosticMessage():42:42 -> getDiagnosticMessage
     43:47: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.zc:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.yc:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     1:1:void <init>(java.lang.String):22:22 -> <init>
@@ -23201,14 +23027,14 @@
     40:40:java.lang.String getDiagnosticMessage():33:33 -> getDiagnosticMessage
     41:41:java.lang.String getDiagnosticMessage():33:33 -> getDiagnosticMessage
     34:38:java.lang.String getDiagnosticMessage():33:37 -> getDiagnosticMessage
-com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Ue:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Pe:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     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.Mf:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.Hf:
     java.util.Set markers -> c
     java.util.Set desugaredLibraryIdentifiers -> b
     1:3:void <init>(java.util.Set,java.util.Set):20:22 -> <init>
@@ -23241,7 +23067,7 @@
     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.lj:
+com.android.tools.r8.errors.ExperimentalClassFileVersionDiagnostic -> com.android.tools.r8.internal.gj:
     com.android.tools.r8.origin.Origin origin -> c
     java.lang.String message -> b
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.lang.String):16:18 -> <init>
@@ -23268,22 +23094,22 @@
     1:11:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.ClassReference):31:41 -> <init>
     1:1:com.android.tools.r8.references.ClassReference getContextType():63:63 -> getContextType
     1:1:java.lang.String getDiagnosticMessage():0:0 -> getDiagnosticMessage
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":88,"2":89,"3":91}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":88,"2":89,"3":90}}
     88:88:java.lang.String getDiagnosticMessage():68:68 -> getDiagnosticMessage
     89:89:java.lang.String getDiagnosticMessage():68:68 -> getDiagnosticMessage
-    91:91:java.lang.String getDiagnosticMessage():70:70 -> getDiagnosticMessage
+    90:90:java.lang.String getDiagnosticMessage():70:70 -> getDiagnosticMessage
     71:87:java.lang.String getDiagnosticMessage():70:86 -> getDiagnosticMessage
     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.Yt:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.Rt:
     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.ou:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.hu:
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.pu:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.iu:
     1:1:void <init>(java.lang.String):8:8 -> <init>
 com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic:
     com.android.tools.r8.references.ClassReference invalidSuperType -> e
@@ -23295,14 +23121,14 @@
     1:1:void <clinit>():19:19 -> <clinit>
     1:10:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.ClassReference,java.lang.String,java.util.List):33:42 -> <init>
     1:1:java.lang.String getDiagnosticMessage():0:0 -> getDiagnosticMessage
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":71,"2":72,"3":74}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":71,"2":72,"3":73}}
     71:71:java.lang.String getDiagnosticMessage():57:57 -> getDiagnosticMessage
     72:72:java.lang.String getDiagnosticMessage():57:57 -> getDiagnosticMessage
-    74:74:java.lang.String getDiagnosticMessage():59:59 -> getDiagnosticMessage
+    73:73:java.lang.String getDiagnosticMessage():59:59 -> getDiagnosticMessage
     60:70:java.lang.String getDiagnosticMessage():59: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.uu:
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.nu:
     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:
@@ -23315,24 +23141,24 @@
     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.IM:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.yM:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     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.nW:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.dW:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     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.v00:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.l00:
     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.O00:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.E00:
     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>
@@ -23342,21 +23168,21 @@
     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.vh:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.qh:
     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$Witness -> com.android.tools.r8.internal.uh:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.ph:
     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.Oh:
+com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.Jh:
     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.sH:
+com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.iH:
     java.util.List dontWarnPatterns -> a
     java.util.Map matchedDontWarnPatterns -> b
     boolean $assertionsDisabled -> c
@@ -23428,7 +23254,7 @@
     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.bm:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.Wl:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo UNKNOWN -> b
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind kind -> a
     boolean $assertionsDisabled -> c
@@ -23469,10 +23295,10 @@
     101:101:java.lang.String toString():98:98 -> toString
     102:102:java.lang.String toString():98:98 -> toString
     99:99:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.am:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.Vl:
     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.bm$a:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.Wl$a:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind[] $VALUES -> t
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReflectiveUseFrom -> m
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReferencedFrom -> l
@@ -23535,7 +23361,7 @@
     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.experimental.startup.StartupConfiguration -> com.android.tools.r8.internal.XV:
+com.android.tools.r8.experimental.startup.StartupConfiguration -> com.android.tools.r8.internal.NV:
     java.util.List startupClasses -> a
     1:2:void <init>(java.util.List):23:24 -> <init>
     1:23:com.android.tools.r8.experimental.startup.StartupConfiguration createStartupConfiguration(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):29:51 -> a
@@ -23550,7 +23376,7 @@
     84:84:com.android.tools.r8.experimental.startup.StartupConfiguration createStartupConfiguration(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):38:38 -> a
     102:102:java.util.List getStartupClasses():67:67 -> a
     1:1:boolean hasStartupClasses():63:63 -> b
-com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.Sa:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.Ra:
     java.util.Map classToFeatureSplitMap -> b
     java.util.Map representativeStringsForFeatureSplit -> c
     com.android.tools.r8.FeatureSplit baseStartup -> a
@@ -23585,12 +23411,12 @@
     329:330:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):228:229 -> a
     1:1:com.android.tools.r8.FeatureSplit getBaseStartup():140:140 -> b
     1:1:boolean isEmpty():175:175 -> c
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.vj:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.qj:
     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.uj:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.pj:
     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>
@@ -23899,81 +23725,101 @@
     129:137:boolean isInterfaceInSuperTypes(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList):471:479 -> a
     129:137:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):462 -> a
     138:141:java.util.List computeProgramClassRelationChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):463:466 -> a
-    142:148:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):520:526 -> a
-    149:149:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):130:130 -> a
-    149:149:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):527 -> a
+    142:146:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):487:491 -> a
+    147:159:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):489:501 -> a
+    160:166:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):520:526 -> a
+    167:167:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):130:130 -> a
+    167:167:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):527 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    150:150:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):130:130 -> a
-    150:150:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):527 -> a
-    151:152:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):531:532 -> a
-    153:153:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):566:566 -> a
-    154:155:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):559:560 -> a
-    154:155:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):566 -> a
-    156:157:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1020:1021 -> a
-    156:157:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):561 -> a
-    156:157:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):566 -> a
-    158:159:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):561:562 -> a
-    158:159:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):566 -> a
-    160:161:com.android.tools.r8.graph.DexClassAndMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):618:619 -> a
-    162:163:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):671:672 -> a
-    164:167:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):703:706 -> a
-    168:173:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):718:723 -> a
-    174:174:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):732:732 -> a
-    175:185:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexType):764:774 -> a
-    186:186:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexClass):784:784 -> a
-    186:186:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexType):776 -> a
-    187:187:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):780:780 -> a
-    188:192:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):789:793 -> a
-    193:193:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):850:850 -> a
-    193:193:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):798 -> a
-    194:196:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
-    194:196:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):851 -> a
-    194:196:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):798 -> a
-    197:197:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):852:852 -> a
-    197:197:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):798 -> a
-    198:198:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):814:814 -> a
-    199:199:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):618:618 -> a
-    199:199:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):814 -> a
+    168:168:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):130:130 -> a
+    168:168:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):527 -> a
+    169:170:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):531:532 -> a
+    171:171:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):566:566 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):559:560 -> a
+    172:173:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):566 -> a
+    174:175:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1020:1021 -> a
+    174:175:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):561 -> a
+    174:175:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):566 -> a
+    176:177:com.android.tools.r8.graph.DexEncodedField lookupInstanceTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):561:562 -> a
+    176:177:com.android.tools.r8.graph.DexEncodedField lookupInstanceTarget(com.android.tools.r8.graph.DexField):566 -> a
+    178:179:com.android.tools.r8.graph.DexClassAndMethod lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):618:619 -> a
+    180:181:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):671:672 -> a
+    182:185:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,boolean):703:706 -> a
+    186:191:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):718:723 -> a
+    192:192:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):732:732 -> a
+    193:205:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):748:760 -> a
+    206:216:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexType):764:774 -> a
+    217:217:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexClass):784:784 -> a
+    217:217:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexType):776 -> a
+    218:218:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):780:780 -> a
+    219:223:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):789:793 -> a
+    224:224:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):850:850 -> a
+    224:224:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):798 -> a
+    225:227:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
+    225:227:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):851 -> a
+    225:227:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):798 -> a
+    228:228:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):852:852 -> a
+    228:228:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):798 -> a
+    229:229:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):814:814 -> a
+    230:230:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):618:618 -> a
+    230:230:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):814 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    200:213:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):618:631 -> a
-    200:213:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):814 -> a
-    214:214:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):816:816 -> a
-    215:215:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> a
-    215:215:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):819 -> a
-    216:217:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):826:827 -> a
-    218:218:void com.android.tools.r8.graph.MethodResolutionResult$IllegalAccessOrNoSuchMethodResult.<init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):988:988 -> a
-    218:218:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):827 -> a
-    219:225:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):829:835 -> a
-    226:227:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):861:862 -> a
-    226:227:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884 -> a
-    226:227:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):544 -> a
-    228:230:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
-    228:230:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):862 -> a
-    228:230:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884 -> a
-    228:230:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):544 -> a
-    231:231:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884:884 -> a
-    231:231:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):544 -> a
-    232:236:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):872:876 -> a
-    232:236:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):867 -> a
-    237:237:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):873:873 -> a
-    237:237:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):867 -> a
-    238:238:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):867:867 -> a
-    239:245:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):908:914 -> a
+    231:244:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):618:631 -> a
+    231:244:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):814 -> a
+    245:245:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):816:816 -> a
     246:246:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> a
-    246:246:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):915 -> a
-    247:247:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):939:939 -> a
-    247:247:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):916 -> a
-    248:248:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):918:918 -> a
-    249:251:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
-    249:251:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):921 -> a
-    252:252:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):926:926 -> a
-    253:255:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
-    253:255:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):928 -> a
-    256:270:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):958:972 -> a
-    271:271:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1014:1014 -> a
-    272:273:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1020:1021 -> a
-    272:273:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1015 -> a
-    274:275:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):1026:1027 -> a
+    246:246:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):819 -> a
+    247:248:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):826:827 -> a
+    249:249:void com.android.tools.r8.graph.MethodResolutionResult$IllegalAccessOrNoSuchMethodResult.<init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):988:988 -> a
+    249:249:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):827 -> a
+    250:256:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):829:835 -> a
+    257:258:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):861:862 -> a
+    257:258:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884 -> a
+    257:258:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):544 -> a
+    259:261:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
+    259:261:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):862 -> a
+    259:261:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884 -> a
+    259:261:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):544 -> a
+    262:262:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):884:884 -> a
+    262:262:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):544 -> a
+    263:267:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):872:876 -> a
+    263:267:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):867 -> a
+    268:268:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):873:873 -> a
+    268:268:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):867 -> a
+    269:269:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):867:867 -> a
+    270:276:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):908:914 -> a
+    277:277:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> a
+    277:277:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):915 -> a
+    278:278:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):939:939 -> a
+    278:278:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):916 -> a
+    279:279:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):918:918 -> a
+    280:282:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
+    280:282:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):921 -> a
+    283:283:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):926:926 -> a
+    284:286:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
+    284:286:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):928 -> a
+    287:301:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):958:972 -> a
+    302:303:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):981:982 -> a
+    304:304:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> a
+    304:304:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):984 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    305:305:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> a
+    305:305:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):984 -> a
+    306:311:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):986:991 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> a
+    312:312:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):993 -> a
+    313:314:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):994:995 -> a
+    315:315:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):850:850 -> a
+    315:315:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):999 -> a
+    316:318:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> a
+    316:318:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):851 -> a
+    316:318:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):999 -> a
+    319:319:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):852:852 -> a
+    319:319:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):999 -> a
+    320:320:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1014:1014 -> a
+    321:322:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1020:1021 -> a
+    321:322:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1015 -> a
+    323:324:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField):1026:1027 -> a
     1:4:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):116:119 -> b
     5:5:com.android.tools.r8.features.ClassToFeatureSplitMap getClassToFeatureSplitMap():142:142 -> b
     5:5:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):120 -> b
@@ -24000,43 +23846,23 @@
     60:61:com.android.tools.r8.graph.DexClassAndField lookupStaticTargetOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):578:579 -> b
     60:61:com.android.tools.r8.graph.DexClassAndField lookupStaticTarget(com.android.tools.r8.graph.DexField):583 -> b
     62:62:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod):728:728 -> b
-    63:75:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):748:760 -> b
-    76:77:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):861:862 -> b
-    76:77:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856 -> b
-    78:80:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> b
-    78:80:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):862 -> b
-    78:80:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856 -> b
-    81:81:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:856 -> b
-    82:83:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):981:982 -> b
-    84:84:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> b
-    84:84:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):984 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:85:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> b
-    85:85:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):984 -> b
-    86:91:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):986:991 -> b
-    92:92:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):608:608 -> b
-    92:92:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):993 -> b
-    93:94:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):994:995 -> b
-    95:95:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):850:850 -> b
-    95:95:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):999 -> b
-    96:98:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> b
-    96:98:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):851 -> b
-    96:98:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):999 -> b
-    99:99:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):852:852 -> b
-    99:99:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):999 -> b
+    63:64:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):861:862 -> b
+    63:64:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856 -> b
+    65:67:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):898:898 -> b
+    65:67:com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder resolveMaximallySpecificTargetHelper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):862 -> b
+    65:67:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856 -> b
+    68:68:com.android.tools.r8.graph.MethodResolutionResult resolveMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):856:856 -> b
     1:5:boolean isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):264:268 -> c
-    6:10:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):487:491 -> c
-    11:23:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):489:501 -> c
-    24:24:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):643:643 -> c
-    25:26:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):637:638 -> c
-    25:26:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):643 -> c
-    27:27:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):676:676 -> c
-    28:30:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):685:687 -> c
-    28:30:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):676 -> c
-    31:31:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):943:943 -> c
-    32:33:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1007:1008 -> c
-    34:35:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1020:1021 -> c
-    34:35:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1008 -> c
+    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):643:643 -> c
+    7:8:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):637:638 -> c
+    7:8:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):643 -> c
+    9:9:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):676:676 -> c
+    10:12:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):685:687 -> c
+    10:12:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOn(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):676 -> c
+    13:13:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):943:943 -> c
+    14:15:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1007:1008 -> c
+    16:17:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):1020:1021 -> c
+    16:17:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1008 -> c
     1:1:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):603:603 -> d
     2:3:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):597:598 -> d
     2:3:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):603 -> d
@@ -24080,7 +23906,7 @@
     62:65:com.android.tools.r8.graph.MethodResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):1117 -> a
     66:66:com.android.tools.r8.graph.MethodResolutionResult internalResolve(com.android.tools.r8.graph.DexClass):1119:1119 -> a
     1:2:com.android.tools.r8.graph.MethodResolutionResult resolve(com.android.tools.r8.graph.DexClass):1081:1082 -> b
-com.android.tools.r8.graph.AppServices -> com.android.tools.r8.internal.q2:
+com.android.tools.r8.graph.AppServices -> com.android.tools.r8.internal.p2:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GraphLens applied -> b
@@ -24146,7 +23972,7 @@
     1:3:java.util.Set computeAllServiceImplementations():65:67 -> b
     1:1:boolean isEmpty():56:56 -> c
     1:5:boolean verifyRewrittenWithLens():189:193 -> d
-com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.q2$a:
+com.android.tools.r8.graph.AppServices$Builder -> com.android.tools.r8.internal.p2$a:
     java.util.Map services -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -24163,7 +23989,7 @@
     16:16:com.android.tools.r8.graph.AppServices build():240:240 -> a
     1:1:java.util.Map access$300(com.android.tools.r8.graph.AppServices$Builder):213:213 -> b
     1:1:com.android.tools.r8.utils.InternalOptions access$400(com.android.tools.r8.graph.AppServices$Builder):213:213 -> c
-com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.internal.p2:
+com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor -> com.android.tools.r8.internal.o2:
     com.android.tools.r8.graph.AppServices$Builder this$0 -> b
     com.android.tools.r8.FeatureSplit featureSplit -> a
     1:2:void <init>(com.android.tools.r8.graph.AppServices$Builder,com.android.tools.r8.FeatureSplit):256:257 -> <init>
@@ -24309,115 +24135,121 @@
     453:453:com.android.tools.r8.graph.DexItemFactory dexItemFactory():325:325 -> a
     454:455:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):349:350 -> a
     456:456:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):381:381 -> a
-    457:457:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1593:1593 -> a
+    457:457:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1581:1581 -> a
     457:457:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):381 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     458:458:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):382:382 -> a
     459:460:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):396:397 -> a
-    461:461:void setCodeLens(com.android.tools.r8.graph.GraphLens):437:437 -> a
-    462:462:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):474:474 -> a
-    463:463:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):479:479 -> a
-    464:464:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():503:503 -> a
-    464:464:boolean checkForTesting(java.util.function.Supplier):844 -> a
-    465:465:boolean checkForTesting(java.util.function.Supplier):844:844 -> a
-    466:466:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):515:515 -> a
-    467:468:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):519:520 -> a
-    469:469:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():532:532 -> a
-    469:469:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):536 -> a
-    470:470:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):536:536 -> a
-    471:471:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():532:532 -> a
-    471:471:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):540 -> a
-    472:472:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):540:540 -> a
-    473:473:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
-    473:473:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):540 -> a
-    474:474:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():532:532 -> a
-    474:474:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):544 -> a
-    475:475:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):544:544 -> a
-    476:476:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
-    476:476:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):544 -> a
-    477:478:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):557:558 -> a
-    479:479:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):586:586 -> a
-    480:480:boolean hasHorizontallyMergedClasses():573:573 -> a
-    480:480:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):586 -> a
-    481:481:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):586:586 -> a
-    482:482:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():581:581 -> a
-    482:482:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):587 -> a
-    483:484:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):587:588 -> a
-    485:485:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():503:503 -> a
-    485:485:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):589 -> a
-    486:488:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):589:591 -> a
-    489:489:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():581:581 -> a
-    489:489:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591 -> a
-    490:490:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591:591 -> a
-    491:492:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):608:609 -> a
-    493:493:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():503:503 -> a
-    493:493:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):610 -> a
-    494:494:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):610:610 -> a
-    495:496:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):622:623 -> a
-    497:497:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():503:503 -> a
-    497:497:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):624 -> a
-    498:498:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):624:624 -> a
-    499:499:boolean hasLiveness():655:655 -> a
-    499:499:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):792 -> a
+    461:468:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):446:453 -> a
+    469:469:boolean com.android.tools.r8.graph.GraphLens.isAppliedLens():0:0 -> a
+    469:469:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):453 -> a
+    470:470:boolean com.android.tools.r8.graph.GraphLens.isClearCodeRewritingLens():0:0 -> a
+    470:470:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):453 -> a
+    471:471:void setCodeLens(com.android.tools.r8.graph.GraphLens):437:437 -> a
+    471:471:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):454 -> a
+    472:472:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):474:474 -> a
+    473:473:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):479:479 -> a
+    474:474:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():503:503 -> a
+    474:474:boolean checkForTesting(java.util.function.Supplier):844 -> a
+    475:475:boolean checkForTesting(java.util.function.Supplier):844:844 -> a
+    476:476:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):515:515 -> a
+    477:478:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):519:520 -> a
+    479:479:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():532:532 -> a
+    479:479:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):536 -> a
+    480:480:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):536:536 -> a
+    481:481:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():532:532 -> a
+    481:481:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):540 -> a
+    482:482:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):540:540 -> a
+    483:483:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
+    483:483:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):540 -> a
+    484:484:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():532:532 -> a
+    484:484:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):544 -> a
+    485:485:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):544:544 -> a
+    486:486:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
+    486:486:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):544 -> a
+    487:488:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):557:558 -> a
+    489:489:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):586:586 -> a
+    490:490:boolean hasHorizontallyMergedClasses():573:573 -> a
+    490:490:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):586 -> a
+    491:491:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):586:586 -> a
+    492:492:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():581:581 -> a
+    492:492:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):587 -> a
+    493:494:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):587:588 -> a
+    495:495:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():503:503 -> a
+    495:495:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):589 -> a
+    496:498:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):589:591 -> a
+    499:499:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():581:581 -> a
+    499:499:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591 -> a
+    500:500:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):591:591 -> a
+    501:502:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):608:609 -> a
+    503:503:com.android.tools.r8.utils.InternalOptions$TestingOptions testing() -> a
+    503:503:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):610 -> a
+    504:504:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):610:610 -> a
+    505:506:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):622:623 -> a
+    507:507:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():503:503 -> a
+    507:507:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):624 -> a
+    508:508:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):624:624 -> a
+    509:509:boolean hasLiveness():655:655 -> a
+    509:509:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):792 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    500:500:boolean hasLiveness():655:655 -> a
-    500:500:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):792 -> a
-    501:502:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):794:795 -> a
-    503:503:com.android.tools.r8.graph.AppServices appServices():271:271 -> a
-    503:503:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):797 -> a
-    504:504:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):797:797 -> a
-    505:505:boolean hasInitClassLens():470:470 -> a
-    505:505:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):798 -> a
-    506:506:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):799:799 -> a
-    507:507:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):474:474 -> a
-    507:507:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):799 -> a
-    508:508:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):801:801 -> a
-    509:509:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():552:552 -> a
-    509:509:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):803 -> a
-    510:510:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):803:803 -> a
-    511:514:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):802:805 -> a
-    515:515:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():528:528 -> a
-    515:515:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):806 -> a
-    516:516:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):806:806 -> a
-    517:517:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):520:520 -> a
-    517:517:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):806 -> a
-    518:518:boolean hasRootSet():507:507 -> a
-    518:518:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):808 -> a
-    519:519:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):809:809 -> a
-    520:522:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):668:670 -> a
-    523:523:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):674:674 -> a
-    524:524:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    524:524:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):674 -> a
+    510:510:boolean hasLiveness():655:655 -> a
+    510:510:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):792 -> a
+    511:512:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):794:795 -> a
+    513:513:com.android.tools.r8.graph.AppServices appServices():271:271 -> a
+    513:513:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):797 -> a
+    514:514:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):797:797 -> a
+    515:515:boolean hasInitClassLens():470:470 -> a
+    515:515:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):798 -> a
+    516:516:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):799:799 -> a
+    517:517:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):474:474 -> a
+    517:517:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):799 -> a
+    518:518:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):801:801 -> a
+    519:519:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():552:552 -> a
+    519:519:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):803 -> a
+    520:520:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):803:803 -> a
+    521:524:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):802:805 -> a
+    525:525:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():528:528 -> a
+    525:525:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):806 -> a
+    526:526:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):806:806 -> a
+    527:527:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):520:520 -> a
+    527:527:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):806 -> a
+    528:528:boolean hasRootSet():507:507 -> a
+    528:528:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):808 -> a
+    529:529:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):809:809 -> a
+    530:532:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):668:670 -> a
+    533:533:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):674:674 -> a
+    534:534:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    534:534:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):674 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    525:525:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    525:525:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):674 -> a
-    526:530:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):677:681 -> a
-    531:540:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):690:699 -> a
-    541:541:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):723:723 -> a
-    541:541:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):701 -> a
-    542:542:com.android.tools.r8.graph.AppServices appServices():271:271 -> a
-    542:542:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):703 -> a
-    543:545:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):704:706 -> a
-    546:546:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():552:552 -> a
-    546:546:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):708 -> a
-    547:547:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):708:708 -> a
-    548:548:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):707:707 -> a
-    549:549:boolean hasRootSet():507:507 -> a
-    549:549:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):710 -> a
-    550:553:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):711:714 -> a
-    554:554:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):520:520 -> a
-    554:554:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):714 -> a
-    555:557:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):739:741 -> a
-    558:577: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):753:772 -> a
-    578:578:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    578:578: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):778 -> a
-    579:588: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):780:789 -> a
-    589:589:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):774:774 -> a
-    590:590:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    590:590:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):774 -> a
-    591:591:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
-    591:591:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):774 -> a
-    592:593:void setAlreadyLibraryDesugared(java.util.Set):815:816 -> a
+    535:535:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    535:535:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):674 -> a
+    536:540:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):677:681 -> a
+    541:550:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):690:699 -> a
+    551:551:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):723:723 -> a
+    551:551:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):701 -> a
+    552:552:com.android.tools.r8.graph.AppServices appServices():271:271 -> a
+    552:552:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):703 -> a
+    553:555:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):704:706 -> a
+    556:556:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():552:552 -> a
+    556:556:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):708 -> a
+    557:557:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):708:708 -> a
+    558:558:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):707:707 -> a
+    559:559:boolean hasRootSet():507:507 -> a
+    559:559:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):710 -> a
+    560:563:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):711:714 -> a
+    564:564:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):520:520 -> a
+    564:564:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):714 -> a
+    565:567:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):739:741 -> a
+    568:587: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):753:772 -> a
+    588:588:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
+    588:588: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):778 -> a
+    589:598: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):780:789 -> a
+    599:599:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):774:774 -> a
+    600:600:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
+    600:600:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):774 -> a
+    601:601:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
+    601:601:boolean lambda$rewriteWithLens$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):774 -> a
+    602:603:void setAlreadyLibraryDesugared(java.util.Set):815:816 -> a
     1:490:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):0:489 -> b
     491:491:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter):187:187 -> b
     492:492:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):191:191 -> b
@@ -24427,16 +24259,9 @@
     496:496:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():200:200 -> b
     497:498:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):389:390 -> b
     499:500:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):418:419 -> b
-    501:508:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):446:453 -> b
-    509:509:boolean com.android.tools.r8.graph.GraphLens.isAppliedLens():0:0 -> b
-    509:509:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):453 -> b
-    510:510:boolean com.android.tools.r8.graph.GraphLens.isClearCodeRewritingLens():0:0 -> b
-    510:510:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):453 -> b
-    511:511:void setCodeLens(com.android.tools.r8.graph.GraphLens):437:437 -> b
-    511:511:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):454 -> b
-    512:512:void setCfByteCodePassThrough(java.util.Set):483:483 -> b
-    513:513:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):728:728 -> b
-    514:518:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):820:824 -> b
+    501:501:void setCfByteCodePassThrough(java.util.Set):483:483 -> b
+    502:502:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):728:728 -> b
+    503:507:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):820:824 -> b
     1:376:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):0:375 -> c
     377:377:boolean isModeled(com.android.tools.r8.graph.DexType):156:156 -> c
     378:380:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):241:243 -> c
@@ -24487,18 +24312,18 @@
     1:1:com.android.tools.r8.graph.GraphLens graphLens():441:441 -> x
     1:1:boolean hasCfByteCodePassThroughMethods():685:685 -> y
     1:1:boolean hasClassHierarchy():638:638 -> z
-com.android.tools.r8.graph.ApplicationReaderMap -> com.android.tools.r8.internal.v2:
+com.android.tools.r8.graph.ApplicationReaderMap -> com.android.tools.r8.internal.u2:
     1:1:void <init>():9:9 -> <init>
     java.lang.String getDescriptor(java.lang.String) -> a
     com.android.tools.r8.graph.DexType getInvertedType(com.android.tools.r8.graph.DexType) -> a
     1:4:com.android.tools.r8.graph.ApplicationReaderMap getInstance(com.android.tools.r8.utils.InternalOptions):20:23 -> a
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.graph.ApplicationReaderMap$EmptyMap -> com.android.tools.r8.internal.t2:
+com.android.tools.r8.graph.ApplicationReaderMap$EmptyMap -> com.android.tools.r8.internal.s2:
     1:1:void <init>():26:26 -> <init>
     java.lang.String getDescriptor(java.lang.String) -> a
     com.android.tools.r8.graph.DexType getInvertedType(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.graph.ApplicationReaderMap$RecordMap -> com.android.tools.r8.internal.u2:
+com.android.tools.r8.graph.ApplicationReaderMap$RecordMap -> com.android.tools.r8.internal.t2:
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):48:49 -> <init>
     1:2:java.lang.String getDescriptor(java.lang.String):54:55 -> a
@@ -24526,11 +24351,11 @@
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     1:2:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):114:115 -> b
     3:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):134:134 -> b
-    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):141:141 -> d
-    2:2:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):146:146 -> d
+    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):141:141 -> c
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):146:146 -> d
     1:4:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):162:165 -> e
     boolean isContextFreeForMethods() -> g
-com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.y3:
+com.android.tools.r8.graph.AssemblyWriter -> com.android.tools.r8.internal.x3:
     com.android.tools.r8.kotlin.Kotlin kotlin -> i
     com.android.tools.r8.contexts.CompilationContext compilationContext -> k
     com.android.tools.r8.graph.AppInfo appInfo -> h
@@ -24545,26 +24370,30 @@
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean,boolean):43:43 -> <init>
     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:2:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):186:186 -> a
-    3:3:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):184:184 -> a
-    4:18:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):194:208 -> a
-    19:19:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):207:207 -> a
-    20:20:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):204:204 -> a
+    2:11:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):129:138 -> a
+    12:12:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":154,"2":155,"3":156}}
+    154:154:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):139:139 -> a
+    155:155:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):139:139 -> a
+    156:156:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):139:139 -> a
+    151:153:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):139:141 -> a
+    157:165:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):152:160 -> a
+    166:166:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":339,"2":340,"3":341}}
+    339:339:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):161:161 -> a
+    340:340:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):161:161 -> a
+    341:341:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):161:161 -> a
+    327:338:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):161:172 -> a
+    342:342:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):186:186 -> a
+    343:343:void lambda$writeIR$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):184:184 -> a
+    344:358:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):194:208 -> a
+    359:359:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):207:207 -> a
+    360:360: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:10:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):129:138 -> b
-    11:11:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":153,"2":154,"3":155}}
-    153:153:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):139:139 -> b
-    154:154:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):139:139 -> b
-    155:155:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):139:139 -> b
-    150:152:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):139:141 -> b
-    156:164:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):152:160 -> b
-    165:165:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":338,"2":339,"3":340}}
-    338:338:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):161:161 -> b
-    339:339:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):161:161 -> b
-    340:340:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):161:161 -> b
-    326:337:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):161:172 -> 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):319:319 -> 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:9:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):72:80 -> c
     10:10:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):0:0 -> c
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":616,"2":617,"3":618}}
@@ -24605,12 +24434,8 @@
     609:609:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):111:111 -> c
     610:615:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):110:115 -> c
     658:658:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):147:147 -> c
-    659:660:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):178:179 -> c
-    661:661: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):321:321 -> c
-    661:661:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):179 -> c
-    662:671:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):180:189 -> c
     1:4:void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):120:123 -> d
-com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.Q5:
+com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.P5:
     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
@@ -24643,353 +24468,365 @@
     java.util.List instructions -> g
     com.android.tools.r8.graph.CfCode$StackMapStatus stackMapStatus -> j
     com.android.tools.r8.position.Position diagnosticPosition -> k
-    1:1:void <clinit>():68:68 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):165:166 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):160:160 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> <init>
-    5:5:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):213:213 -> <init>
-    8:75:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):154:221 -> <init>
-    1:1:com.android.tools.r8.position.Position getDiagnosticPosition():271:271 -> A0
-    1:1:java.util.List getInstructions():287:287 -> B0
-    1:1:java.util.List getLocalVariables():295:295 -> C0
-    1:1:int getMaxLocals():262:262 -> D0
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):166:167 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):161:161 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> <init>
+    5:5:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> <init>
+    6:6:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):214:214 -> <init>
+    8:75:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):155:222 -> <init>
+    1:1:java.util.List getInstructions():288:288 -> A0
+    1:1:java.util.List getLocalVariables():296:296 -> B0
+    1:1:int getMaxLocals():263:263 -> C0
+    1:1:int getMaxStack():259:259 -> D0
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
-    1:1:int getMaxStack():258:258 -> E0
-    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():254:254 -> F0
-    1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():266:267 -> G0
-    1:1:java.util.List getTryCatchRanges():283:283 -> H0
+    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():255:255 -> E0
+    1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():267:268 -> F0
+    1:1:java.util.List getTryCatchRanges():284:284 -> G0
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> O
     com.android.tools.r8.graph.CfCode asCfCode() -> W
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):68:68 -> a
-    2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.code.CfOrDexInstruction):241:241 -> a
-    3:3:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.cf.code.CfInstruction):245:245 -> a
-    3:3:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.code.CfOrDexInstruction):241 -> a
-    4:4:void setInstructions(java.util.List):291:291 -> a
-    5:8:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):353:356 -> a
-    9:9:void lambda$acceptHashing$0(com.android.tools.r8.utils.structural.HashingVisitor,com.android.tools.r8.cf.code.CfInstruction):356:356 -> a
-    10:11:int acceptCompareTo(com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.structural.CompareToVisitor):361:362 -> a
-    12:12:java.util.Collection lambda$acceptCompareTo$1(com.android.tools.r8.graph.CfCode):366:366 -> a
-    13:13:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):366:366 -> a
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> a
+    2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.code.CfOrDexInstruction):242:242 -> a
+    3:3:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.cf.code.CfInstruction):246:246 -> a
+    3:3:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.code.CfOrDexInstruction):242 -> a
+    4:4:void setInstructions(java.util.List):292:292 -> a
+    5:8:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):354:357 -> a
+    9:9:void lambda$acceptHashing$0(com.android.tools.r8.utils.structural.HashingVisitor,com.android.tools.r8.cf.code.CfInstruction):357:357 -> a
+    10:11:int acceptCompareTo(com.android.tools.r8.graph.CfCode,com.android.tools.r8.utils.structural.CompareToVisitor):362:363 -> a
+    12:12:java.util.Collection lambda$acceptCompareTo$1(com.android.tools.r8.graph.CfCode):367:367 -> a
+    13:13:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):367:367 -> a
     14:14:com.android.tools.r8.utils.structural.StructuralAcceptor com.android.tools.r8.graph.CfCompareHelper.instructionAcceptor():106:106 -> a
-    14:14:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):366 -> a
-    15:15:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):366:366 -> a
+    14:14:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):367 -> a
+    15:15:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):367:367 -> a
     16:16:com.android.tools.r8.utils.structural.StructuralAcceptor com.android.tools.r8.graph.CfCompareHelper.tryCatchRangeAcceptor():122:122 -> a
-    16:16:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):367 -> a
-    17:17:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):367:367 -> a
+    16:16:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):368 -> a
+    17:17:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):368:368 -> a
     18:18:com.android.tools.r8.utils.structural.StructuralAcceptor com.android.tools.r8.graph.CfCompareHelper.localVariableAcceptor():137:137 -> a
-    18:18:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):368 -> a
-    19:19:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):368:368 -> a
-    20:21:void writeCf(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):405:406 -> a
-    22:22:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):871:871 -> a
-    22:22:void writeCf(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):406 -> a
-    23:28:void writeCf(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):406:411 -> a
-    29:45:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):375:391 -> a
-    29:45:void writeCf(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):411 -> a
-    46:46:void writeCf(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):412:412 -> a
-    47:47:void com.android.tools.r8.cf.code.CfLabel.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):73:73 -> a
-    47:47:void writeCf(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):413 -> a
-    48:64:void writeCf(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):416:432 -> a
-    65:65:void writeCf(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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":549,"2":550,"3":551}}
-    549:549:void writeCf(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):433:433 -> a
-    550:550:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    550:550:void writeCf(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):433 -> a
-    551:551:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    551:551:void writeCf(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):433 -> a
-    499:506:void writeCf(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):434:441 -> a
-    507:527:void writeCf(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):435:455 -> a
-    528:528: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):473:473 -> a
-    528:528:void writeCf(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):448 -> a
-    529:529:void writeCf(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):0:0 -> a
+    18:18:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):369 -> a
+    19:19:void lambda$acceptCompareTo$4(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):369:369 -> a
+    20:21:void writeCf(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):406:407 -> a
+    22:22: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):878:878 -> a
+    22:22:void writeCf(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):407 -> a
+    23:29:void writeCf(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):407:413 -> a
+    30:46:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):376:392 -> a
+    30:46:void writeCf(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):413 -> a
+    47:47:void writeCf(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):414:414 -> a
+    48:48:void com.android.tools.r8.cf.code.CfLabel.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):73:73 -> a
+    48:48:void writeCf(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):415 -> a
+    49:65:void writeCf(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):418:434 -> a
+    66:66:void writeCf(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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":552,"2":553,"3":554}}
-    552:552: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):473:473 -> a
-    552:552:void writeCf(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):448 -> a
+    552:552:void writeCf(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):435:435 -> a
     553:553:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    553:553: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):473 -> a
-    553:553:void writeCf(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):448 -> a
+    553:553:void writeCf(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):435 -> a
     554:554:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    554:554: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):473 -> a
-    554:554:void writeCf(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):448 -> a
-    530:536: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):474:474 -> a
-    530:536:void writeCf(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):448 -> a
-    537:539:void writeCf(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):458:460 -> a
-    540:540: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):473:473 -> a
-    540:540:void writeCf(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):459 -> a
-    541:541:void writeCf(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):0:0 -> a
+    554:554:void writeCf(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):435 -> a
+    502:509:void writeCf(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):436:443 -> a
+    510:530:void writeCf(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):437:457 -> a
+    531:531: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):475:475 -> a
+    531:531:void writeCf(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):450 -> a
+    532:532:void writeCf(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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557}}
-    555:555: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):473:473 -> a
-    555:555:void writeCf(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):459 -> a
+    555:555: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):475:475 -> a
+    555:555:void writeCf(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):450 -> a
     556:556:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    556:556: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):473 -> a
-    556:556:void writeCf(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):459 -> a
+    556:556: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):475 -> a
+    556:556:void writeCf(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):450 -> a
     557:557:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    557:557: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):473 -> a
-    557:557:void writeCf(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):459 -> a
-    542:548: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):474:474 -> a
-    542:548:void writeCf(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):459 -> a
-    558:560: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):507:509 -> a
-    561:563:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):556:558 -> a
-    561:563: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):508 -> a
-    564:564:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):557:557 -> a
-    564:564: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):508 -> a
-    565:567:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):591:591 -> a
-    565:567:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):568 -> a
-    565:567: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):508 -> a
-    578:580:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):602:604 -> a
-    578:580:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):568 -> a
-    578:580: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):508 -> a
-    581:581:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):603:603 -> a
-    581:581:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):568 -> a
-    581:581: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):508 -> a
-    582:585: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):522:525 -> a
-    586:588:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):556:558 -> a
-    586:588: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):526 -> a
-    589:589:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):557:557 -> a
-    589:589: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):526 -> a
-    590:592:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):591:591 -> a
-    590:592:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):568 -> a
-    590:592: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):526 -> a
-    603:605:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):602:604 -> a
-    603:605:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):568 -> a
-    603:605: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):526 -> a
-    606:606:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):603:603 -> a
-    606:606:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):568 -> a
-    606:606: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):526 -> a
-    607:612: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):627:632 -> a
-    613:613:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    613:613: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):632 -> a
+    557:557: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):475 -> a
+    557:557:void writeCf(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):450 -> a
+    533:539: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):476:476 -> a
+    533:539:void writeCf(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):450 -> a
+    540:542:void writeCf(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):460:462 -> a
+    543:543: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):475:475 -> a
+    543:543:void writeCf(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):461 -> a
+    544:544:void writeCf(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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":558,"2":559,"3":560}}
+    558:558: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):475:475 -> a
+    558:558:void writeCf(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):461 -> a
+    559:559:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    559:559: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):475 -> a
+    559:559:void writeCf(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):461 -> a
+    560:560:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    560:560: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):475 -> a
+    560:560:void writeCf(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):461 -> a
+    545:551: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):476:476 -> a
+    545:551:void writeCf(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):461 -> a
+    561:561: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):510:510 -> a
+    562:562:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):459:459 -> a
+    562:562: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):510 -> a
+    563:563:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.GraphLens.lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):461:461 -> a
+    563:563:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.ir.conversion.IRBuilder.lookupPrototypeChanges(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):459 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    614:627: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):632:645 -> a
-    628:639:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):650:661 -> a
-    640:645:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):669:674 -> a
-    646:646:void lambda$registerCodeReferencesForDesugaring$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):674:674 -> a
-    647:687:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):681:721 -> a
-    688:688:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):720:720 -> a
-    689:689:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):692:692 -> a
-    690:690:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):769:769 -> a
-    691:701: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):777:787 -> a
-    702:702:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():447:447 -> a
-    702:702: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):787 -> a
+    563:563: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):510 -> a
+    564:567: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):509:512 -> a
+    568:570:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):563:565 -> a
+    568:570: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):511 -> a
+    571:571:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):564:564 -> a
+    571:571: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):511 -> a
+    572:574:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):598:598 -> a
+    572:574:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):575 -> a
+    572:574: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):511 -> a
+    585:587:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):609:611 -> a
+    585:587:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):575 -> a
+    585:587: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):511 -> a
+    588:588:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):610:610 -> a
+    588:588:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):575 -> a
+    588:588: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):511 -> a
+    589:592: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):525:528 -> a
+    593:595:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):563:565 -> a
+    593:595: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):529 -> a
+    596:596:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):564:564 -> a
+    596:596: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):529 -> a
+    597:599:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):598:598 -> a
+    597:599:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):575 -> a
+    597:599: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):529 -> a
+    610:612:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):609:611 -> a
+    610:612:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):575 -> a
+    610:612: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):529 -> a
+    613:613:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):610:610 -> a
+    613:613:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,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.proto.RewrittenPrototypeDescription):575 -> a
+    613:613: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):529 -> a
+    614:619: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):634:639 -> a
+    620:620:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    620:620: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):639 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    703:703:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():447:447 -> a
-    703:703: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):787 -> a
-    704:704:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():275:275 -> a
-    704:704: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):788 -> a
-    705:713: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):789:797 -> a
-    714:720: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):796:802 -> a
-    721:721:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():283:283 -> a
-    721:721: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):805 -> a
-    722:722: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):805:805 -> a
-    723:732:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):811:820 -> a
-    733:736:int com.android.tools.r8.graph.DexCode.getLargestPrefix(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexString):312:315 -> a
-    733:736:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):820 -> a
-    737:752:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):820:835 -> a
-    753:754: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):99:100 -> a
-    753:754:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):835 -> a
-    755:755:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):832:832 -> a
-    756:759:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):840:843 -> a
-    760:760:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    760:760:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):843 -> a
-    761:768:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):844:851 -> a
-    769:769:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    769:769:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):851 -> a
-    770:774:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):853:857 -> a
-    775:775:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):854:854 -> a
-    776:776:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    776:776:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):859 -> a
-    777:783:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):860:866 -> a
-    784:784:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
-    784:784:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):866 -> a
-    785:816:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):875:906 -> a
-    817:823:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):32:38 -> a
-    817:823:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):906 -> a
-    824:824:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    824:824:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):38 -> a
+    621:634: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):639:652 -> a
+    635:646:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):657:668 -> a
+    647:652:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):676:681 -> a
+    653:653:void lambda$registerCodeReferencesForDesugaring$5(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):681:681 -> a
+    654:694:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):688:728 -> a
+    695:695:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):727:727 -> a
+    696:696:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):699:699 -> a
+    697:697:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):776:776 -> a
+    698:708: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):784:794 -> a
+    709:709:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():447:447 -> a
+    709:709: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):794 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    824:824:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):906 -> a
-    825:825:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):39:39 -> a
-    825:825:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):906 -> a
-    826:826:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):982:982 -> a
-    826:826:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):905 -> a
-    827:832:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):909:914 -> a
-    833:839:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):21:27 -> a
-    833:839:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):914 -> a
-    840:840:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    840:840:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):27 -> a
+    710:710:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():447:447 -> a
+    710:710: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):794 -> a
+    711:711:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():275:275 -> a
+    711:711: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):795 -> a
+    712:720: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):796:804 -> a
+    721:727: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):803:809 -> a
+    728:728:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():283:283 -> a
+    728:728: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):812 -> a
+    729:729: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):812:812 -> a
+    730:739:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):818:827 -> a
+    740:743:int com.android.tools.r8.graph.DexCode.getLargestPrefix(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexString):312:315 -> a
+    740:743:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):827 -> a
+    744:759:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):827:842 -> a
+    760:761: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):100:101 -> a
+    760:761:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):842 -> a
+    762:762:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):839:839 -> a
+    763:766:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):847:850 -> a
+    767:767:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    767:767:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):850 -> a
+    768:775:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):851:858 -> a
+    776:776:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    776:776:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):858 -> a
+    777:781:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):860:864 -> a
+    782:782:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
+    783:783:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    783:783:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):866 -> a
+    784:790:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):867:873 -> a
+    791:791:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
+    791:791:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):873 -> a
+    792:802: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.proto.RewrittenPrototypeDescription):886:896 -> a
+    803:803:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    803:803: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.proto.RewrittenPrototypeDescription):896 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    840:840:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):914 -> a
-    841:841:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):28:28 -> a
-    841:841:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):914 -> a
-    842:842:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):982:982 -> a
-    842:842:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):913 -> a
-    843:843:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    843:843:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):919 -> a
-    844:844:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    844:844:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):921 -> a
-    845:850:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):922:927 -> a
-    851:851:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
-    851:851:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):987 -> a
-    851:851:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):927 -> a
-    852:861:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):987:996 -> a
-    852:861:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):927 -> a
-    862:862:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    862:862:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):996 -> a
-    862:862:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):927 -> a
-    863:863:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    863:863:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):996 -> a
-    863:863:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):927 -> a
-    864:864:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):1001:1001 -> a
-    864:864:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):927 -> a
-    865:867:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):931:933 -> a
-    868:875:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):44:51 -> a
-    868:875:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):933 -> a
-    876:876:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    876:876:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):51 -> a
+    804:821: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.proto.RewrittenPrototypeDescription):897:914 -> a
+    822:822:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    822:822: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.proto.RewrittenPrototypeDescription):914 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    876:876:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):933 -> a
-    877:877:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):52:52 -> a
-    877:877:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):933 -> a
-    878:878:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):982:982 -> a
-    878:878:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):932 -> a
-    879:888:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):935:944 -> a
-    889:890:boolean shouldComputeInitialFrame():1005:1006 -> a
-    889:890:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):944 -> a
-    891:891:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    891:891:boolean shouldComputeInitialFrame():1008 -> a
-    891:891:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):944 -> a
-    892:892:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    892:892:boolean shouldComputeInitialFrame():1008 -> a
-    892:892:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):944 -> a
-    893:893:boolean shouldComputeInitialFrame():1013:1013 -> a
-    893:893:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):944 -> a
-    894:894:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):944:944 -> a
-    895:895:boolean shouldComputeInitialFrame():1013:1013 -> a
-    895:895:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):944 -> a
-    896:896:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):945:945 -> a
-    897:898:boolean shouldComputeInitialFrame():1005:1006 -> a
-    897:898:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):946 -> a
-    899:899:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    899:899:boolean shouldComputeInitialFrame():1008 -> a
-    899:899:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):946 -> a
-    900:900:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    900:900:boolean shouldComputeInitialFrame():1008 -> a
-    900:900:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):946 -> a
-    901:901:boolean shouldComputeInitialFrame():1013:1013 -> a
-    901:901:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):946 -> a
-    902:902:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):947:947 -> a
-    903:910:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1022:1029 -> a
-    903:910:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):949 -> a
-    911:911:boolean com.android.tools.r8.graph.DexMethod.isHorizontallyMergedInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):313:313 -> a
-    911:911:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1030 -> a
-    911:911:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):949 -> a
-    912:912:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    912:912:boolean com.android.tools.r8.graph.DexMethod.isHorizontallyMergedInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):313 -> a
-    912:912:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1030 -> a
-    912:912:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):949 -> a
-    913:913:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1032:1032 -> a
-    913:913:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):949 -> a
-    914:914:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1031:1031 -> a
-    914:914:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):949 -> a
-    915:934:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1026:1045 -> a
-    915:934:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):949 -> a
-    935:935:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):949:949 -> a
-    936:952:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):947:963 -> a
-    953:953:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
-    953:953:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):963 -> a
-    954:961:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):963:970 -> a
-    962:975:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):61:74 -> a
-    962:975:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):969 -> a
-    976:976:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    976:976:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):74 -> a
+    823:823: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.proto.RewrittenPrototypeDescription):912:912 -> a
+    824:828: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
+    824:828: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.proto.RewrittenPrototypeDescription):912 -> a
+    829:829:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):1005:1005 -> a
+    829:829: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.proto.RewrittenPrototypeDescription):911 -> a
+    830:837: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.proto.RewrittenPrototypeDescription):918:925 -> a
+    838:838:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    838:838: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.proto.RewrittenPrototypeDescription):925 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    976:976:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):969 -> a
-    977:977:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):75:75 -> a
-    977:977:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):969 -> a
-    978:978:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):982:982 -> a
-    978:978:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):968 -> a
-    979:979:boolean shouldComputeInitialFrame():1013:1013 -> a
-    979:979:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):946 -> a
-    980:980:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1057:1057 -> a
-    981:981:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
-    981:981:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1088 -> a
+    839:839: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.proto.RewrittenPrototypeDescription):923:923 -> a
+    840:844: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
+    840:844: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.proto.RewrittenPrototypeDescription):923 -> a
+    845:845:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):1005:1005 -> a
+    845:845: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.proto.RewrittenPrototypeDescription):922 -> a
+    846:846:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    846:846: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.proto.RewrittenPrototypeDescription):932 -> a
+    847:847:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    847:847: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.proto.RewrittenPrototypeDescription):934 -> a
+    848:853: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.proto.RewrittenPrototypeDescription):935:940 -> a
+    854:854:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
+    854:854:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):1010 -> a
+    854:854: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.proto.RewrittenPrototypeDescription):940 -> a
+    855:864:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):1010:1019 -> a
+    855:864: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.proto.RewrittenPrototypeDescription):940 -> a
+    865:865:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    865:865:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):1019 -> a
+    865:865: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.proto.RewrittenPrototypeDescription):940 -> a
+    866:866:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    866:866:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):1019 -> a
+    866:866: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.proto.RewrittenPrototypeDescription):940 -> a
+    867:867:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):1024:1024 -> a
+    867:867: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.proto.RewrittenPrototypeDescription):940 -> a
+    868:872: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.proto.RewrittenPrototypeDescription):944:948 -> a
+    873:873:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    873:873: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.proto.RewrittenPrototypeDescription):948 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    981:981:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1058 -> a
-    982:982:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
-    982:982:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1088 -> a
-    982:982:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1058 -> a
-    983:984:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1088:1089 -> a
-    983:984:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1058 -> a
-    985:985:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
-    985:985:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1088 -> a
+    874:874: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.proto.RewrittenPrototypeDescription):946:946 -> a
+    875:880: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
+    875:880: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.proto.RewrittenPrototypeDescription):946 -> a
+    881:881:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):1005:1005 -> a
+    881:881: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.proto.RewrittenPrototypeDescription):945 -> a
+    882:882: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.proto.RewrittenPrototypeDescription):952:952 -> a
+    883:883: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.proto.RewrittenPrototypeDescription):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2893,"2":2894,"3":2895}}
+    2893:2893: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.proto.RewrittenPrototypeDescription):952:952 -> a
+    2894:2894:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    2894:2894: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.proto.RewrittenPrototypeDescription):952 -> a
+    2895:2895:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    2895:2895: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.proto.RewrittenPrototypeDescription):952 -> a
+    1836:1836: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.proto.RewrittenPrototypeDescription):953:953 -> a
+    1837:1837: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.proto.RewrittenPrototypeDescription):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2896,"2":2897,"3":2898}}
+    2896:2896: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.proto.RewrittenPrototypeDescription):953:953 -> a
+    2897:2897:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    2897:2897: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.proto.RewrittenPrototypeDescription):953 -> a
+    2898:2898:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    2898:2898: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.proto.RewrittenPrototypeDescription):953 -> a
+    2791:2804: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.proto.RewrittenPrototypeDescription):954:967 -> a
+    2805:2806:boolean shouldComputeInitialFrame():1028:1029 -> a
+    2805:2806: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.proto.RewrittenPrototypeDescription):967 -> a
+    2807:2807:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    2807:2807:boolean shouldComputeInitialFrame():1031 -> a
+    2807:2807: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.proto.RewrittenPrototypeDescription):967 -> a
+    2808:2808:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2808:2808:boolean shouldComputeInitialFrame():1031 -> a
+    2808:2808: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.proto.RewrittenPrototypeDescription):967 -> a
+    2809:2809:boolean shouldComputeInitialFrame():1036:1036 -> a
+    2809:2809: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.proto.RewrittenPrototypeDescription):967 -> a
+    2810:2810: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.proto.RewrittenPrototypeDescription):967:967 -> a
+    2811:2811:boolean shouldComputeInitialFrame():1036:1036 -> a
+    2811:2811: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.proto.RewrittenPrototypeDescription):967 -> a
+    2812:2812: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.proto.RewrittenPrototypeDescription):968:968 -> a
+    2813:2814:boolean shouldComputeInitialFrame():1028:1029 -> a
+    2813:2814: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.proto.RewrittenPrototypeDescription):969 -> a
+    2815:2815:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    2815:2815:boolean shouldComputeInitialFrame():1031 -> a
+    2815:2815: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.proto.RewrittenPrototypeDescription):969 -> a
+    2816:2816:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2816:2816:boolean shouldComputeInitialFrame():1031 -> a
+    2816:2816: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.proto.RewrittenPrototypeDescription):969 -> a
+    2817:2817:boolean shouldComputeInitialFrame():1036:1036 -> a
+    2817:2817: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.proto.RewrittenPrototypeDescription):969 -> a
+    2818:2818: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.proto.RewrittenPrototypeDescription):970:970 -> a
+    2819:2839: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.proto.RewrittenPrototypeDescription):1042:1062 -> a
+    2819:2839: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.proto.RewrittenPrototypeDescription):971 -> a
+    2840:2840:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    2840:2840: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.proto.RewrittenPrototypeDescription):1064 -> a
+    2840:2840: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.proto.RewrittenPrototypeDescription):971 -> a
+    2841:2851: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.proto.RewrittenPrototypeDescription):1065:1075 -> a
+    2841:2851: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.proto.RewrittenPrototypeDescription):971 -> a
+    2852:2852: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.proto.RewrittenPrototypeDescription):971:971 -> a
+    2853:2863: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.proto.RewrittenPrototypeDescription):970:980 -> a
+    2864:2864:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
+    2864:2864: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.proto.RewrittenPrototypeDescription):980 -> a
+    2865:2869: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.proto.RewrittenPrototypeDescription):980:984 -> a
+    2870:2876: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.proto.RewrittenPrototypeDescription):983:989 -> a
+    2877:2877:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    2877:2877: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.proto.RewrittenPrototypeDescription):989 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    985:985:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1059 -> a
-    986:986:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
-    986:986:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1088 -> a
-    986:986:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1059 -> a
-    987:988:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1088:1089 -> a
-    987:988:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1059 -> a
-    989:1006:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1063:1080 -> a
-    1007:1011:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1079:1083 -> a
-    1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.graph.CfCode):367:367 -> b
-    2:6:void verifyFramesOrRemove(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):538:542 -> b
-    7:7:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):1052:1052 -> b
-    8:8:boolean lambda$isAssignablePredicate$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1052:1052 -> b
-    1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.graph.CfCode):368:368 -> c
-    1:2:int countNonStackOperations(int):315:316 -> h
-    1:2:boolean estimatedSizeForInliningAtMost(int):305 -> h
-    3:3:boolean computeEquals(java.lang.Object):490:490 -> h
-    1:1:void setMaxLocals(int):275:275 -> i
-    1:1:void setMaxStack(int):279:279 -> j
-    1:1:int computeHashCode():485:485 -> m0
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():250:250 -> n
+    2878:2878: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.proto.RewrittenPrototypeDescription):992:992 -> a
+    2879:2890: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
+    2879:2890: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.proto.RewrittenPrototypeDescription):987 -> a
+    2891:2891:com.android.tools.r8.graph.CfCode$StackMapStatus reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):1005:1005 -> a
+    2891:2891: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.proto.RewrittenPrototypeDescription):986 -> a
+    2892:2892:boolean shouldComputeInitialFrame():1036:1036 -> a
+    2892:2892: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.proto.RewrittenPrototypeDescription):969 -> a
+    2899:2899:boolean lambda$isAssignablePredicate$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1082:1082 -> a
+    2900:2900:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1087:1087 -> a
+    2901:2901:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
+    2901:2901:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1118 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2901:2901:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1088 -> a
+    2902:2902:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
+    2902:2902:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1118 -> a
+    2902:2902:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1088 -> a
+    2903:2904:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1118:1119 -> a
+    2903:2904:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1088 -> a
+    2905:2905:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
+    2905:2905:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1118 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2905:2905:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1089 -> a
+    2906:2906:boolean com.android.tools.r8.graph.DexType.isByteType():284:284 -> a
+    2906:2906:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1118 -> a
+    2906:2906:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1089 -> a
+    2907:2908:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1118:1119 -> a
+    2907:2908:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1089 -> a
+    2909:2926:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1093:1110 -> a
+    2927:2931:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1109:1113 -> a
+    1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.graph.CfCode):368:368 -> 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.proto.RewrittenPrototypeDescription):545:549 -> b
+    7:7:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):1082:1082 -> b
+    1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.graph.CfCode):369:369 -> c
+    1:2:int countNonStackOperations(int):316:317 -> h
+    1:2:boolean estimatedSizeForInliningAtMost(int):306 -> h
+    3:3:boolean computeEquals(java.lang.Object):492:492 -> h
+    1:1:void setMaxLocals(int):276:276 -> i
+    1:1:void setMaxStack(int):280:280 -> j
+    1:1:int computeHashCode():487:487 -> m0
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():251:251 -> n
     com.android.tools.r8.graph.CfWritableCode asCfWritableCode() -> n0
-    1:2:int countNonStackOperations(int):315:316 -> q0
-    1:2:int estimatedSizeForInlining():300 -> q0
-    1:2:int estimatedDexCodeSizeUpperBoundInBytes():310 -> q0
-    1:2:int countNonStackOperations(int):315:316 -> r0
-    1:2:int estimatedSizeForInlining():300 -> r0
+    1:2:int countNonStackOperations(int):316:317 -> q0
+    1:2:int estimatedSizeForInlining():301 -> q0
+    1:2:int estimatedDexCodeSizeUpperBoundInBytes():311 -> q0
+    1:2:int countNonStackOperations(int):316:317 -> r0
+    1:2:int estimatedSizeForInlining():301 -> r0
     boolean isCfCode() -> s0
     boolean isCfWritableCode() -> t0
-    1:1:java.lang.String toString():764:764 -> toString
+    1:1:java.lang.String toString():771:771 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):132:132 -> toString
-    2:2:java.lang.String toString():764 -> toString
-    3:3:java.lang.String toString():764:764 -> toString
+    2:2:java.lang.String toString():771 -> toString
+    3:3:java.lang.String toString():771:771 -> toString
+    1:1:com.android.tools.r8.position.Position getDiagnosticPosition():272:272 -> z0
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.k$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.cf.code.CfLabel start -> c
     com.android.tools.r8.cf.code.CfLabel end -> d
     int index -> a
-    1:1:void <clinit>():85:85 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):92:95 -> <init>
-    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):85:85 -> a
-    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):104:106 -> a
-    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():122:122 -> a
-    6:6:int acceptCompareTo(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):127:127 -> a
-    7:8:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):131:132 -> a
+    1:1:void <clinit>():86:86 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):93:96 -> <init>
+    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):86:86 -> a
+    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):105:107 -> a
+    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():123:123 -> a
+    6:6:int acceptCompareTo(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):128:128 -> a
+    7:8:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):132:133 -> a
     9:9:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
-    9:9:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):132 -> a
+    9:9:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):133 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:11:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):132:133 -> a
+    10:11:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):133:134 -> a
     12:12:com.android.tools.r8.utils.structural.StructuralSpecification com.android.tools.r8.utils.structural.StructuralSpecification.withCustomItem(java.util.function.Function,com.android.tools.r8.utils.structural.StructuralAcceptor):43:43 -> a
-    12:12:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):133 -> a
+    12:12:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:14:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):133:134 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):85:85 -> b
-    2:2:int getIndex():110:110 -> b
-    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):85:85 -> c
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():114:114 -> c
-    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):85:85 -> d
-    2:2:com.android.tools.r8.cf.code.CfLabel getStart():118:118 -> d
+    13:14:void lambda$acceptCompareTo$0(com.android.tools.r8.graph.CfCompareHelper,com.android.tools.r8.utils.structural.StructuralSpecification):134:135 -> a
+    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):86:86 -> b
+    2:2:int getIndex():111:111 -> b
+    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):86:86 -> c
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():115:115 -> c
+    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):86:86 -> d
+    2:2:com.android.tools.r8.cf.code.CfLabel getStart():119:119 -> d
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":141,"2":142,"3":143}}
-    141:141:java.lang.String toString():139:139 -> toString
-    142:142:java.lang.String toString():139:139 -> toString
-    143:143:java.lang.String toString():139:139 -> toString
-    140:140:java.lang.String toString():139:139 -> toString
-com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.R6:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":142,"2":143,"3":144}}
+    142:142:java.lang.String toString():140:140 -> toString
+    143:143:java.lang.String toString():140:140 -> toString
+    144:144:java.lang.String toString():140:140 -> toString
+    141:141:java.lang.String toString():140:140 -> toString
+com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.Q6:
     com.android.tools.r8.position.MethodPosition methodPosition -> c
     com.android.tools.r8.origin.Origin origin -> b
     java.lang.String diagnosticMessage -> d
@@ -24997,10 +24834,10 @@
     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.T6:
+com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.S6:
     int $r8$clinit -> b
-    1:1:void <init>(java.lang.String):12:12 -> <init>
-    1:1:com.android.tools.r8.graph.CfCodeStackMapValidatingException error(java.lang.String):16:16 -> 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
 com.android.tools.r8.graph.CfCompareHelper -> com.android.tools.r8.graph.p:
     com.android.tools.r8.graph.CfCode code2 -> b
     com.android.tools.r8.graph.CfCode code1 -> a
@@ -25064,7 +24901,7 @@
     3:3:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):137:137 -> a
     4:4:void acceptHashing(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.utils.structural.HashingVisitor):146:146 -> a
     4:4:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):137 -> a
-com.android.tools.r8.graph.CfWritableCode -> com.android.tools.r8.internal.W8:
+com.android.tools.r8.graph.CfWritableCode -> com.android.tools.r8.internal.V8:
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> O
     com.android.tools.r8.graph.CfCode asCfCode() -> W
     void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> a
@@ -25114,7 +24951,7 @@
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):73 -> i
     1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):67:69 -> j
     com.android.tools.r8.graph.AccessFlags self() -> z
-com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.L9:
+com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.K9:
     boolean isClasspathClass() -> G
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> H
     void forEachClassField(java.util.function.Consumer) -> b
@@ -25123,7 +24960,7 @@
     boolean isLibraryClass() -> g0
     java.lang.Iterable allImmediateSupertypes() -> h0
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> l
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.N9:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.M9:
     java.util.Deque worklist -> d
     java.util.Set visited -> c
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope scope -> b
@@ -25151,7 +24988,7 @@
     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.r:
     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.ClassResolutionResult -> com.android.tools.r8.internal.Qa:
+com.android.tools.r8.graph.ClassResolutionResult -> com.android.tools.r8.internal.Pa:
     com.android.tools.r8.graph.DexClass toSingleClassWithProgramOverLibrary() -> D
     boolean hasClassResolutionResult() -> Y
     void forEachClassResolutionResult(java.util.function.Consumer) -> a
@@ -25169,10 +25006,10 @@
     20:20:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
     20:20:com.android.tools.r8.graph.ClassResolutionResult build():63 -> a
     21:23:com.android.tools.r8.graph.ClassResolutionResult build():63:65 -> a
-com.android.tools.r8.graph.ClassResolutionResult$ClasspathAndLibraryClassResolutionResult -> com.android.tools.r8.internal.Na:
+com.android.tools.r8.graph.ClassResolutionResult$ClasspathAndLibraryClassResolutionResult -> com.android.tools.r8.internal.Ma:
     1:1:void <init>(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexLibraryClass):136:136 -> <init>
     1:1:com.android.tools.r8.graph.DexClass toSingleClassWithProgramOverLibrary():141:141 -> D
-com.android.tools.r8.graph.ClassResolutionResult$MultipleClassResolutionResult -> com.android.tools.r8.internal.Oa:
+com.android.tools.r8.graph.ClassResolutionResult$MultipleClassResolutionResult -> com.android.tools.r8.internal.Na:
     com.android.tools.r8.graph.DexClass programOrClasspathClass -> b
     com.android.tools.r8.graph.DexLibraryClass libraryClass -> c
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexLibraryClass):100:102 -> <init>
@@ -25186,10 +25023,10 @@
     boolean hasClassResolutionResult() -> Y
     void forEachClassResolutionResult(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.graph.ClassResolutionResult noResult():75:75 -> a
-com.android.tools.r8.graph.ClassResolutionResult$ProgramAndLibraryClassResolutionResult -> com.android.tools.r8.internal.Pa:
+com.android.tools.r8.graph.ClassResolutionResult$ProgramAndLibraryClassResolutionResult -> com.android.tools.r8.internal.Oa:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass):122:122 -> <init>
     1:1:com.android.tools.r8.graph.DexClass toSingleClassWithProgramOverLibrary():127:127 -> D
-com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.kb:
+com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.jb:
     1:1:com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext):22:22 -> a
 com.android.tools.r8.graph.ClasspathField -> com.android.tools.r8.graph.v:
     boolean $assertionsDisabled -> f
@@ -25212,22 +25049,22 @@
     4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():44:45 -> L
     com.android.tools.r8.graph.ClasspathMethod asClasspathMethod() -> N
     1:1:com.android.tools.r8.graph.DexClass getHolder():9:9 -> q
-com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.lb:
+com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.kb:
     com.android.tools.r8.graph.DexClass asDexClass() -> h
-com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.mb:
+com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.lb:
     com.android.tools.r8.graph.Definition context -> b
     com.android.tools.r8.graph.ProgramDerivedContext programDerivedContext -> c
     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 -> getContext
-com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.mb:
     com.android.tools.r8.graph.ClasspathOrLibraryDefinition asClasspathOrLibraryDefinition() -> g
 com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.x:
     1:1:void <init>():19:19 -> <init>
-    1:1:com.android.tools.r8.graph.DexCode asDexCode():148:148 -> C
+    1:1:com.android.tools.r8.graph.DexCode asDexCode():144:144 -> C
     com.android.tools.r8.graph.ThrowExceptionCode asThrowExceptionCode() -> S
-    1:1:com.android.tools.r8.graph.CfCode asCfCode():136:136 -> W
+    1:1:com.android.tools.r8.graph.CfCode asCfCode():132:132 -> W
     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) -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.code.CfOrDexInstruction) -> a
     void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry) -> a
@@ -25242,23 +25079,22 @@
     35:35: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):33:33 -> a
     39:39:com.android.tools.r8.graph.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):37:37 -> a
     40:40:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):59:59 -> a
-    41:41:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):157:157 -> a
-    42:42:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):167:167 -> a
-    1:1:boolean estimatedSizeForInliningAtMost(int):130:130 -> h
-    1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():140:140 -> n0
-    1:1:com.android.tools.r8.graph.DexWritableCode asDexWritableCode():152:152 -> o0
-    1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():144:144 -> p0
+    41:41:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):153:153 -> a
+    42:42:com.android.tools.r8.graph.Code getCodeAsInlining(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):163:163 -> a
+    1:1:boolean estimatedSizeForInliningAtMost(int):126:126 -> h
+    1:1:com.android.tools.r8.graph.CfWritableCode asCfWritableCode():136:136 -> n0
+    1:1:com.android.tools.r8.graph.DexWritableCode asDexWritableCode():148:148 -> o0
+    1:1:com.android.tools.r8.graph.LazyCfCode asLazyCfCode():140:140 -> p0
     int estimatedDexCodeSizeUpperBoundInBytes() -> q0
     int estimatedSizeForInlining() -> r0
     boolean isCfCode() -> s0
     boolean isCfWritableCode() -> t0
     boolean isDexCode() -> u0
     boolean isDexWritableCode() -> v0
-    boolean isHorizontalClassMergerCode() -> w0
-    boolean isIncompleteHorizontalClassMergerCode() -> x0
-    boolean isSharedCodeObject() -> y0
-    boolean verifyNoInputReaders() -> z0
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.Ae:
+    boolean isHorizontalClassMergingCode() -> w0
+    boolean isSharedCodeObject() -> x0
+    boolean verifyNoInputReaders() -> y0
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.ze:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexString signature -> d
     com.android.tools.r8.graph.DexType type -> c
@@ -25284,7 +25120,6 @@
     com.android.tools.r8.graph.DefaultInstanceInitializerCode INSTANCE -> d
     1:4:void <clinit>():55:58 -> <clinit>
     1:1:void <init>():61:61 -> <init>
-    1:1:com.android.tools.r8.graph.DefaultInstanceInitializerCode get():64:64 -> A0
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> O
     com.android.tools.r8.graph.Code asCode() -> R
     int getOutgoingRegisterSize() -> U
@@ -25302,84 +25137,84 @@
     13:18:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):331:336 -> a
     13:18:void uncanonicalizeCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):83 -> a
     19:19:void uncanonicalizeCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):83:83 -> a
-    20:20:boolean lambda$hasDefaultInstanceInitializerCode$0(com.android.tools.r8.cf.code.CfInstruction):111:111 -> a
-    21:21:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    21:21:boolean lambda$hasDefaultInstanceInitializerCode$0(com.android.tools.r8.cf.code.CfInstruction):111 -> a
-    22:22:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    22:22:boolean lambda$hasDefaultInstanceInitializerCode$0(com.android.tools.r8.cf.code.CfInstruction):111 -> a
-    23:23:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):133:133 -> a
-    24:24: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):139:139 -> a
-    25:25:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    25:25: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):139 -> a
+    20:49:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):88:117 -> a
+    50:50:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):141:141 -> a
+    50:50:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):119 -> a
+    51:51:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):120:120 -> a
+    52:52:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():22:22 -> a
+    52:52:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229 -> a
+    52:52:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):120 -> a
+    53:53:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
+    53:53:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):120 -> a
+    54:54:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):123:123 -> a
+    55:55:boolean com.android.tools.r8.cf.code.CfInstruction.isReturnVoid():0:0 -> a
+    55:55:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):123 -> a
+    56:56:boolean lambda$hasDefaultInstanceInitializerCode$0(com.android.tools.r8.cf.code.CfInstruction):111:111 -> a
+    57:57:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    57:57:boolean lambda$hasDefaultInstanceInitializerCode$0(com.android.tools.r8.cf.code.CfInstruction):111 -> a
+    58:58:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    58:58:boolean lambda$hasDefaultInstanceInitializerCode$0(com.android.tools.r8.cf.code.CfInstruction):111 -> a
+    59:59:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):133:133 -> a
+    60:60: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):139:139 -> a
+    61:61:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    61:61: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):139 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:26: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):140:140 -> a
-    27:27:void com.android.tools.r8.graph.DefaultInstanceInitializerCode$DefaultInstanceInitializerSourceCode.<init>(com.android.tools.r8.graph.DexMethod):389:389 -> a
-    27:27: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):140 -> a
-    28:28: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):142:142 -> a
-    29:29: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):156:156 -> a
-    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    30:30: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):156 -> a
+    62:62: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):140:140 -> a
+    63:63:void com.android.tools.r8.graph.DefaultInstanceInitializerCode$DefaultInstanceInitializerSourceCode.<init>(com.android.tools.r8.graph.DexMethod):389:389 -> a
+    63:63: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):140 -> a
+    64:64: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):142:142 -> a
+    65:65: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):156:156 -> a
+    66:66:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    66:66: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):156 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    31:35: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):157:161 -> a
-    36:36: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):175:175 -> a
-    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():22:22 -> a
-    37:37:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229 -> a
-    37:37: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):175 -> a
+    67:71: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):157:161 -> a
+    72:72: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):175:175 -> a
+    73:73:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():22:22 -> a
+    73:73:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229 -> a
+    73:73: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):175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    38:38:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
-    38:38: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):175 -> a
-    39:39:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
-    39:39: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):175 -> a
+    74:74:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
+    74:74: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):175 -> a
+    75:75:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
+    75:75: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):175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    40:40:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
-    40:40:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
-    40:40: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):175 -> a
-    41:41:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    41:41:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
-    41:41:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
-    41:41: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):175 -> a
-    42:42:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):225:225 -> a
-    42:42:int getRegisterSize(com.android.tools.r8.graph.ProgramMethod):251 -> a
-    43:43:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310:310 -> a
-    43:43:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):301 -> a
-    44:44:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
-    44:44:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310 -> a
-    44:44:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):301 -> a
-    45:45:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310:310 -> a
-    45:45:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):301 -> a
-    46:46:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310:310 -> a
-    46:46:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):306 -> a
-    47:47:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
-    47:47:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310 -> a
-    47:47:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):306 -> a
-    48:48:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310:310 -> a
-    48:48:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):306 -> a
-    49:52:void writeCf(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):347:350 -> a
-    53:61:void writeCf(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):348:356 -> a
-    62:62:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):366:366 -> a
-    63:63:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():22:22 -> a
-    63:63:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229 -> a
-    63:63:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):366 -> a
-    64:64:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
-    64:64:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):366 -> a
-    65:67:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):366:368 -> a
-    68:68:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):383:383 -> a
-    1:30:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):88:117 -> b
-    31:31:boolean com.android.tools.r8.cf.code.CfInvoke.isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):141:141 -> b
-    31:31:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):119 -> b
-    32:32:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):120:120 -> b
-    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():22:22 -> b
-    33:33:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229 -> b
-    33:33:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):120 -> b
-    34:34:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> b
-    34:34:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):120 -> b
-    35:35:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):123:123 -> b
-    36:36:boolean com.android.tools.r8.cf.code.CfInstruction.isReturnVoid():0:0 -> b
-    36:36:boolean hasDefaultInstanceInitializerCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):123 -> b
-    37:37:boolean lambda$hasDefaultInstanceInitializerCode$1(com.android.tools.r8.cf.code.CfInstruction):112:112 -> b
-    38:38:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> b
-    38:38:boolean lambda$hasDefaultInstanceInitializerCode$1(com.android.tools.r8.cf.code.CfInstruction):112 -> b
-    39:39:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):225:225 -> b
+    76:76:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
+    76:76:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    76:76: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):175 -> a
+    77:77:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    77:77:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    77:77:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    77:77: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):175 -> a
+    78:78:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):225:225 -> a
+    78:78:int getRegisterSize(com.android.tools.r8.graph.ProgramMethod):251 -> a
+    79:79:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310:310 -> a
+    79:79:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):301 -> a
+    80:80:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
+    80:80:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310 -> a
+    80:80:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):301 -> a
+    81:81:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310:310 -> a
+    81:81:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):301 -> a
+    82:82:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310:310 -> a
+    82:82:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):306 -> a
+    83:83:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
+    83:83:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310 -> a
+    83:83:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):306 -> a
+    84:84:void internalRegisterCodeReferences(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.UseRegistry):310:310 -> a
+    84:84:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):306 -> a
+    85:88:void writeCf(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):347:350 -> a
+    89:97:void writeCf(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):348:356 -> a
+    98:98:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):366:366 -> a
+    99:99:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.ProgramMethod.getHolder():22:22 -> a
+    99:99:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229 -> a
+    99:99:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):366 -> a
+    100:100:com.android.tools.r8.graph.DexMethod getParentConstructor(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexItemFactory):229:229 -> a
+    100:100:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):366 -> a
+    101:103:void writeDex(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ObjectToOffsetMapping):366:368 -> a
+    104:104:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):383:383 -> a
+    1:1:boolean lambda$hasDefaultInstanceInitializerCode$1(com.android.tools.r8.cf.code.CfInstruction):112:112 -> b
+    2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> b
+    2:2:boolean lambda$hasDefaultInstanceInitializerCode$1(com.android.tools.r8.cf.code.CfInstruction):112 -> b
+    3:3:int getIncomingRegisterSize(com.android.tools.r8.graph.ProgramMethod):225:225 -> b
     void setCallSiteContexts(com.android.tools.r8.graph.ProgramMethod) -> c
     1:3:int getMaxLocals(com.android.tools.r8.graph.ProgramMethod):233:235 -> d
     boolean computeEquals(java.lang.Object) -> h
@@ -25393,6 +25228,7 @@
     1:1:java.lang.String toString():378:378 -> toString
     com.android.tools.r8.graph.DexString getHighestSortingString() -> u
     com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> w
+    1:1:com.android.tools.r8.graph.DefaultInstanceInitializerCode get():64:64 -> z0
 com.android.tools.r8.graph.DefaultInstanceInitializerCode$DefaultInstanceInitializerSourceCode -> com.android.tools.r8.graph.y:
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):394:399 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):393:393 -> <init>
@@ -25415,7 +25251,7 @@
     13:14:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):410:411 -> d
     15:15:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):405:405 -> d
     1:1:java.util.List getInstructionBuilders():403:403 -> f
-com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.af:
+com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.Ve:
     com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> A
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> I
     boolean isMethod() -> J
@@ -25495,7 +25331,7 @@
     1:1:com.android.tools.r8.graph.DexType getAnnotationType():79:79 -> m0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():75:75 -> n
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.bg:
+com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.Wf:
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind FIELD -> b
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind METHOD -> c
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind TYPE -> d
@@ -25599,35 +25435,33 @@
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> h
     com.android.tools.r8.com.google.common.collect.ImmutableList dataResourceProviders -> a
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):48:55 -> <init>
-    void forEachLibraryType(java.util.function.Consumer) -> a
-    1:1:com.android.tools.r8.graph.DexApplicationReadFlags access$000(com.android.tools.r8.graph.DexApplication):26:26 -> a
-    2:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():62:62 -> a
-    3:3:com.android.tools.r8.graph.DexDefinitionSupplier getDefinitionsSupplier(com.android.tools.r8.synthesis.SyntheticDefinitionsProvider):68:68 -> a
-    4:4:java.util.List classesWithDeterministicOrder(java.util.List):141:141 -> a
-    5:6:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):268:269 -> a
-    7:7:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):274:274 -> a
-    7:7:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):268 -> a
-    8:8:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):274:274 -> a
-    void forEachProgramType(java.util.function.Consumer) -> b
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication asDirect():278:278 -> b
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):47:54 -> <init>
+    1:1:com.android.tools.r8.graph.DexApplicationReadFlags access$000(com.android.tools.r8.graph.DexApplication):25:25 -> a
+    2:2:com.android.tools.r8.graph.DexItemFactory dexItemFactory():61:61 -> a
+    3:3:com.android.tools.r8.graph.DexDefinitionSupplier getDefinitionsSupplier(com.android.tools.r8.synthesis.SyntheticDefinitionsProvider):67:67 -> a
+    4:4:java.util.List classesWithDeterministicOrder(java.util.List):136:136 -> a
+    5:6:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):263:264 -> a
+    7:7:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):269:269 -> a
+    7:7:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):263 -> a
+    8:8:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver):269:269 -> a
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication asDirect():273:273 -> b
     com.android.tools.r8.graph.DexApplication$Builder builder() -> c
     com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType) -> c
-    1:3:java.util.Collection classes():125:127 -> d
+    1:3:java.util.Collection classes():120:122 -> d
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType) -> e
-    1:1:java.util.Collection classesWithDeterministicOrder():131:131 -> e
-    1:1:com.android.tools.r8.graph.DexApplicationReadFlags getFlags():146:146 -> f
-    1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():158:158 -> g
+    1:1:java.util.Collection classesWithDeterministicOrder():126:126 -> e
+    1:1:com.android.tools.r8.graph.DexApplicationReadFlags getFlags():141:141 -> f
+    1:1:com.android.tools.r8.naming.ClassNameMapper getProguardMap():153:153 -> g
     java.util.Collection programClasses() -> h
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> i
 com.android.tools.r8.graph.DexApplication$1 -> com.android.tools.r8.graph.E:
     com.android.tools.r8.graph.DexApplication val$self -> b
     com.android.tools.r8.synthesis.SyntheticDefinitionsProvider val$syntheticDefinitionsProvider -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticDefinitionsProvider,com.android.tools.r8.graph.DexApplication):68:68 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():85:85 -> a
-    1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):72:72 -> d
-    1:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):78:80 -> e
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.synthesis.SyntheticDefinitionsProvider,com.android.tools.r8.graph.DexApplication):67:67 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():84:84 -> a
+    1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):71:71 -> d
+    1:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):77:79 -> e
 com.android.tools.r8.graph.DexApplication$Builder -> com.android.tools.r8.graph.F$a:
     java.util.List dataResourceProviders -> b
     java.util.List programClasses -> a
@@ -25637,29 +25471,29 @@
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.graph.DexString highestSortingString -> g
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():161:161 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):176:176 -> <init>
-    2:19:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):163:180 -> <init>
-    20:20:void <init>(com.android.tools.r8.graph.DexApplication):185:185 -> <init>
-    21:52:void <init>(com.android.tools.r8.graph.DexApplication):163:194 -> <init>
+    1:1:void <clinit>():156:156 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):171:171 -> <init>
+    2:19:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):158:175 -> <init>
+    20:20:void <init>(com.android.tools.r8.graph.DexApplication):180:180 -> <init>
+    21:52:void <init>(com.android.tools.r8.graph.DexApplication):158:189 -> <init>
     com.android.tools.r8.graph.DirectMappedDexApplication$Builder asDirect() -> a
-    1:1:void setFlags(com.android.tools.r8.graph.DexApplicationReadFlags):206:206 -> a
-    2:4:com.android.tools.r8.graph.DexApplication$Builder setProguardMap(com.android.tools.r8.naming.ClassNameMapper):210:212 -> a
-    5:6:com.android.tools.r8.graph.DexApplication$Builder removeProgramClasses(java.util.function.Predicate):216:217 -> a
-    7:10:com.android.tools.r8.graph.DexApplication$Builder replaceProgramClasses(java.util.Collection):221:224 -> a
-    11:11:com.android.tools.r8.graph.DexApplication$Builder addDataResourceProvider(com.android.tools.r8.DataResourceProvider):228:228 -> a
-    12:13:com.android.tools.r8.graph.DexApplication$Builder setHighestSortingString(com.android.tools.r8.graph.DexString):233:234 -> a
-    14:15:com.android.tools.r8.graph.DexApplication$Builder addProgramClass(com.android.tools.r8.graph.DexProgramClass):238:239 -> a
+    1:1:void setFlags(com.android.tools.r8.graph.DexApplicationReadFlags):201:201 -> a
+    2:4:com.android.tools.r8.graph.DexApplication$Builder setProguardMap(com.android.tools.r8.naming.ClassNameMapper):205:207 -> a
+    5:6:com.android.tools.r8.graph.DexApplication$Builder removeProgramClasses(java.util.function.Predicate):211:212 -> a
+    7:10:com.android.tools.r8.graph.DexApplication$Builder replaceProgramClasses(java.util.Collection):216:219 -> a
+    11:11:com.android.tools.r8.graph.DexApplication$Builder addDataResourceProvider(com.android.tools.r8.DataResourceProvider):223:223 -> a
+    12:13:com.android.tools.r8.graph.DexApplication$Builder setHighestSortingString(com.android.tools.r8.graph.DexString):228:229 -> a
+    14:15:com.android.tools.r8.graph.DexApplication$Builder addProgramClass(com.android.tools.r8.graph.DexProgramClass):233:234 -> a
     void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass) -> b
     com.android.tools.r8.graph.DexApplication build() -> b
-    1:1:java.util.List getProgramClasses():257:257 -> c
+    1:1:java.util.List getProgramClasses():252:252 -> c
     com.android.tools.r8.graph.DexApplication$Builder self() -> d
 com.android.tools.r8.graph.DexApplication$ReorderBox -> com.android.tools.r8.graph.G:
     java.util.Collection classes -> a
-    1:2:void <init>(java.util.Collection):100:101 -> <init>
-    1:1:java.util.Collection getClasses():114:114 -> a
-    1:3:boolean reorderClasses():106:108 -> b
-com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.cg:
+    1:2:void <init>(java.util.Collection):99:100 -> <init>
+    1:1:java.util.Collection getClasses():113:113 -> a
+    1:3:boolean reorderClasses():105:107 -> b
+com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.Xf:
     boolean hasReadProgramClassFromDex -> a
     boolean hasReadProgramClassFromCf -> b
     boolean hasReadRecordReferenceFromProgramClass -> c
@@ -25667,13 +25501,15 @@
     1:1:boolean hasReadProgramClassFromCf():24:24 -> a
     1:1:boolean hasReadProgramClassFromDex():28:28 -> b
     1:1:boolean hasReadRecordReferenceFromProgramClass():32:32 -> c
-com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.qg:
+com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.lg:
     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>
     java.lang.String getFileEnding() -> a
     java.io.PrintStream lambda$write$1(java.io.PrintStream,com.android.tools.r8.graph.DexClass) -> a
     void lambda$write$2(java.io.PrintStream) -> a
+    void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
+    void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream) -> a
     1:1:com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider oneFilePerClass(java.nio.file.Path):40:40 -> a
     2:4:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):41:41 -> a
     6:8:java.io.PrintStream lambda$oneFilePerClass$0(java.nio.file.Path,com.android.tools.r8.graph.DexClass):43:43 -> a
@@ -25685,8 +25521,6 @@
     23:23:void lambda$writeClass$3(java.io.PrintStream,com.android.tools.r8.graph.DexEncodedField):93:93 -> a
     24:24:void lambda$writeClass$4(java.io.PrintStream,com.android.tools.r8.graph.ProgramMethod):96:96 -> a
     void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
-    void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> b
-    void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream) -> b
     1:2:void write(java.nio.file.Path):51:52 -> b
     3:10:void com.android.tools.r8.graph.DexByteCodeWriter.write(com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider,java.util.function.Consumer):72:79 -> b
     3:10:void write(java.nio.file.Path):52 -> b
@@ -25706,7 +25540,7 @@
     void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> d
-com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.pg:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.kg:
     java.io.PrintStream get(com.android.tools.r8.graph.DexClass) -> a
 com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.I:
     com.android.tools.r8.graph.DexString methodName -> e
@@ -25857,23 +25691,23 @@
     1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):103:103 -> <init>
     2:72:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):57:127 -> <init>
     73:73:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":467,"2":468,"3":469}}
-    467:467:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):127:127 -> <init>
-    468:468:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):127:127 -> <init>
-    469:469:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):127:127 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":464,"2":465,"3":466}}
+    464:464:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):127:127 -> <init>
+    465:465:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):127:127 -> <init>
+    466:466:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):127:127 -> <init>
     200:204:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):127:131 -> <init>
     205:205:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":473,"2":474,"3":475}}
-    473:473:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):131:131 -> <init>
-    474:474:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):131:131 -> <init>
-    475:475:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):131:131 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":464,"2":465,"3":466}}
+    464:464:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):131:131 -> <init>
+    465:465:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):131:131 -> <init>
+    466:466:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):131:131 -> <init>
     336:338:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):131:133 -> <init>
     339:339:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):123:123 -> <init>
     340:340:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":476,"2":477,"3":478}}
-    476:476:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):123:123 -> <init>
-    477:477:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):123:123 -> <init>
-    478:478:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):123:123 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":464,"2":465,"3":466}}
+    464:464:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):123:123 -> <init>
+    465:465:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):123:123 -> <init>
+    466:466:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):123:123 -> <init>
     463:463:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):123:123 -> <init>
     1:1:java.lang.Iterable classMethods():228:228 -> A0
     1:1:void clearClassSignature():1059:1059 -> B0
@@ -26185,7 +26019,7 @@
     1:1:java.lang.Iterable virtualMethods():273:273 -> x1
     1:1:java.util.List allMethodsSorted():310:310 -> y0
     1:1:java.lang.Iterable classFields():201:201 -> z0
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.rg:
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.mg:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.K:
     boolean $assertionsDisabled -> e
@@ -26290,8 +26124,7 @@
     1:1: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):95:95 -> <init>
     2:2: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):87:87 -> <init>
     3:15: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,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata):106:118 -> <init>
-    1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():228:228 -> A0
-    1:1:boolean isEmptyVoidMethod():360:360 -> B0
+    1:1:boolean isEmptyVoidMethod():360:360 -> A0
     com.android.tools.r8.graph.DexCode asDexCode() -> C
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
     com.android.tools.r8.graph.Code asCode() -> R
@@ -26390,6 +26223,7 @@
     boolean isDexCode() -> u0
     boolean isDexWritableCode() -> v0
     1:4:com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting():606:609 -> w
+    1:1:com.android.tools.r8.graph.DexDebugInfo getDebugInfo():228:228 -> z0
 com.android.tools.r8.graph.DexCode$Try -> com.android.tools.r8.graph.O$a:
     boolean $assertionsDisabled -> f
     int instructionCount -> d
@@ -26476,7 +26310,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():863:863 -> getType
     1:1:int hashCode():883:883 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():859:859 -> n
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.ug:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.pg:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString sourceFile -> d
     boolean $assertionsDisabled -> j
@@ -26874,7 +26708,7 @@
     127:134:void emitAdvancementEvents(int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.ir.code.Position,java.util.List,com.android.tools.r8.graph.DexItemFactory,boolean):248:255 -> a
     135:144:void emitAdvancementEvents(int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.ir.code.Position,java.util.List,com.android.tools.r8.graph.DexItemFactory,boolean):254:263 -> a
     145:145:void emitAdvancementEvents(int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.ir.code.Position,java.util.List,com.android.tools.r8.graph.DexItemFactory,boolean):262:262 -> a
-    146:146:com.android.tools.r8.graph.DexDebugEvent$SetOutlineCallerFrame com.android.tools.r8.graph.DexItemFactory.createSetOutlineCallerFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap):2852:2852 -> a
+    146:146:com.android.tools.r8.graph.DexDebugEvent$SetOutlineCallerFrame com.android.tools.r8.graph.DexItemFactory.createSetOutlineCallerFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap):2850:2850 -> a
     146:146:void emitAdvancementEvents(int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.ir.code.Position,java.util.List,com.android.tools.r8.graph.DexItemFactory,boolean):262 -> a
     147:151:void emitAdvancementEvents(int,com.android.tools.r8.ir.code.Position,int,com.android.tools.r8.ir.code.Position,java.util.List,com.android.tools.r8.graph.DexItemFactory,boolean):261:265 -> a
     152:164:void addDefaultEventWithAdvancePcIfNecessary(int,int,java.util.List,com.android.tools.r8.graph.DexItemFactory):272:284 -> a
@@ -26910,52 +26744,56 @@
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):26:26 -> a
     2:6:int acceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):74:78 -> a
     2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):26 -> a
-    7:31:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):289:313 -> a
-    32:39:com.android.tools.r8.graph.DexDebugInfoForWriting convertToWritable(com.android.tools.r8.graph.DexDebugInfo):320:327 -> a
+    7:10:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):285:288 -> a
+    11:11:boolean isEventBasedInfo():43:43 -> a
+    11:11:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):288 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    12:32:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):289:309 -> a
+    33:40:com.android.tools.r8.graph.DexDebugInfoForWriting convertToWritable(com.android.tools.r8.graph.DexDebugInfo):316:323 -> a
     1:1:boolean computeEquals(java.lang.Object):83:83 -> h
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():66:66 -> n
     com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo asEventBasedInfo() -> n0
     com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo asPcBasedInfo() -> o0
     com.android.tools.r8.graph.DexDebugInfo$DebugInfoKind getKind() -> p0
-    int getParameterCount() -> q0
-    int getStartLine() -> r0
-    1:1:boolean isEventBasedInfo():43:43 -> s0
-    1:1:boolean isPcBasedInfo():47:47 -> t0
-    com.android.tools.r8.graph.DexDebugInfo self() -> u0
+    int getStartLine() -> q0
+    1:1:boolean isPcBasedInfo():47:47 -> r0
+    com.android.tools.r8.graph.DexDebugInfo self() -> s0
 com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo -> com.android.tools.r8.graph.d0$a:
     com.android.tools.r8.graph.DexString[] parameters -> f
     com.android.tools.r8.graph.DexDebugEvent[] events -> g
     int startLine -> e
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():190:190 -> <clinit>
-    1:5:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):202:206 -> <init>
+    1:1:void <clinit>():186:186 -> <clinit>
+    1:5:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):198:202 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):190:190 -> a
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):186:186 -> a
     2:6:int com.android.tools.r8.graph.DexDebugInfo.acceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):74:78 -> a
-    2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):190 -> a
-    7:7:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):197:197 -> a
-    8:10:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):197:199 -> a
-    11:15:java.util.List computeEntries(com.android.tools.r8.graph.DexMethod):235:239 -> a
-    16:16:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):249:249 -> a
-    17:18:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):254:255 -> a
-    19:19:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):272:272 -> a
-    1:1:com.android.tools.r8.graph.DexString[] lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):198:198 -> b
-    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$specify$2(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):199:199 -> c
-    1:1:int computeHashCode():244:244 -> m0
+    2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):186 -> a
+    7:7:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):193:193 -> a
+    8:10:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):193:195 -> a
+    11:15:java.util.List computeEntries(com.android.tools.r8.graph.DexMethod):231:235 -> a
+    16:16:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):245:245 -> a
+    17:17:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):250:250 -> a
+    18:18:boolean com.android.tools.r8.graph.DexDebugInfo.isEventBasedInfo():43:43 -> a
+    18:18:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):250 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    19:20:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):250:251 -> a
+    21:21:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):268:268 -> a
+    1:1:com.android.tools.r8.graph.DexString[] lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):194:194 -> b
+    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$specify$2(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):195:195 -> c
+    1:1:int computeHashCode():240:240 -> m0
     com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo asEventBasedInfo() -> n0
     com.android.tools.r8.graph.DexDebugInfo$DebugInfoKind getKind() -> p0
-    1:1:int getParameterCount():231:231 -> q0
-    1:1:int getStartLine():226:226 -> r0
-    1:1:java.lang.String toString():277:277 -> toString
+    1:1:int getStartLine():222:222 -> q0
+    com.android.tools.r8.graph.DexDebugInfo self() -> s0
+    1:1:java.lang.String toString():273:273 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":287,"2":288,"3":289}}
-    287:287:java.lang.String toString():278:278 -> toString
-    288:288:java.lang.String toString():278:278 -> toString
-    289:289:java.lang.String toString():278:278 -> toString
-    280:286:java.lang.String toString():278:284 -> toString
-    com.android.tools.r8.graph.DexDebugInfo self() -> u0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":283,"2":284,"3":285}}
+    283:283:java.lang.String toString():274:274 -> toString
+    284:284:java.lang.String toString():274:274 -> toString
+    285:285:java.lang.String toString():274:274 -> toString
+    276:282:java.lang.String toString():274:280 -> toString
 com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo -> com.android.tools.r8.graph.e0:
-    int $r8$clinit -> h
     int maxPc -> f
     boolean $assertionsDisabled -> g
     int parameterCount -> e
@@ -26971,66 +26809,64 @@
     9:9:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):132:132 -> a
     10:11:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):137:138 -> a
     12:12:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):143:143 -> a
-    13:18:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):168:173 -> a
+    13:18:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):164:169 -> a
     19:19:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:80 -> a
-    19:19:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):173 -> a
+    19:19:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):169 -> a
     20:21:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:81 -> a
-    20:21:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):173 -> a
+    20:21:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):169 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:23:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):174:175 -> a
+    22:23:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):170:171 -> a
     24:24:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:80 -> a
-    24:24:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):175 -> a
+    24:24:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):171 -> a
     25:26:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:81 -> a
-    25:26:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):175 -> a
+    25:26:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):171 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:27:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):177:177 -> a
+    27:27:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):173:173 -> a
     1:1:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):92:92 -> b
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):92:92 -> c
-    1:1:int estimatedWriteSize():162:162 -> j0
-    2:4:int estimatedWriteSize(int,int):152:154 -> j0
-    2:4:int estimatedWriteSize():162 -> j0
+    1:3:int estimatedWriteSize():153:155 -> j0
     1:1:int computeHashCode():127:127 -> m0
     com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo asPcBasedInfo() -> o0
     com.android.tools.r8.graph.DexDebugInfo$DebugInfoKind getKind() -> p0
-    1:1:int getParameterCount():107:107 -> q0
-    int getStartLine() -> r0
+    int getStartLine() -> q0
+    com.android.tools.r8.graph.DexDebugInfo self() -> s0
+    1:1:int getParameterCount():107:107 -> t0
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":187,"2":188,"3":189}}
-    187:187:java.lang.String toString():182:182 -> toString
-    188:188:java.lang.String toString():182:182 -> toString
-    189:189:java.lang.String toString():182:182 -> toString
-    183:186:java.lang.String toString():182:185 -> toString
-    com.android.tools.r8.graph.DexDebugInfo self() -> u0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":183,"2":184,"3":185}}
+    183:183:java.lang.String toString():178:178 -> toString
+    184:184:java.lang.String toString():178:178 -> toString
+    185:185:java.lang.String toString():178:178 -> toString
+    179:182:java.lang.String toString():178:181 -> toString
 com.android.tools.r8.graph.DexDebugInfo$WritableEventBasedDebugInfo -> com.android.tools.r8.graph.f0:
-    1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[],com.android.tools.r8.graph.DexDebugInfo$1):331:331 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):336:336 -> <init>
-    1:1:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):259:259 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):341 -> a
+    1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[],com.android.tools.r8.graph.DexDebugInfo$1):327:327 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):332:332 -> <init>
+    1:1:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):255:255 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):337 -> a
     2:2:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    2:2:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):261 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):341 -> a
-    3:4:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):264:265 -> a
-    3:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):341 -> a
-    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):346:346 -> a
-    6:11:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):362:367 -> a
+    2:2:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):257 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):337 -> a
+    3:4:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):260:261 -> a
+    3:4:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens):337 -> a
+    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):342:342 -> a
+    6:11:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):358:363 -> a
     12:12:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:80 -> a
-    12:12:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):368 -> a
+    12:12:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):364 -> a
     13:13:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:80 -> a
-    13:13:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):368 -> a
+    13:13:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):364 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):80:80 -> a
-    14:14:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):368 -> a
+    14:14:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):364 -> a
     15:15:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):81:81 -> a
-    15:15:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):368 -> a
+    15:15:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):364 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):370:370 -> a
-    1:2:int estimatedWriteSize():351:352 -> j0
+    16:16:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):366:366 -> a
+    1:2:int estimatedWriteSize():347:348 -> j0
 com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod -> com.android.tools.r8.graph.g0:
     com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod INSTANCE -> i
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):16:16 -> <init>
-    1:1:com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod getInstance():20:20 -> v0
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.vg:
+    1:1:com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod getInstance():20:20 -> t0
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.qg:
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens) -> a
@@ -27343,7 +27179,7 @@
     3:3:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):458:458 -> b
     3:3:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():454 -> b
     4:4:com.android.tools.r8.graph.DexEncodedField$Builder setDeprecated(boolean):493:493 -> b
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.wg:
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.rg:
     com.android.tools.r8.androidapi.ComputedApiLevel apiLevelForDefinition -> e
     boolean d8R8Synthesized -> d
     com.android.tools.r8.graph.DexMember reference -> f
@@ -27481,10 +27317,10 @@
     790:790:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
     790:790:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):466 -> a
     791:792:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):467:468 -> a
-    793:793:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    793:793:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     793:793:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):948 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    794:794:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    794:794:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     794:794:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):948 -> a
     795:808:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):954:967 -> a
     795:808:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):949 -> a
@@ -27558,7 +27394,7 @@
     4221:4224:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):911:914 -> a
     4228:4237:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):929:938 -> a
     4238:4241:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):996:999 -> a
-    4242:4242:int com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.getParameterCount():231:231 -> a
+    4242:4242:int com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.getParameterCount():227:227 -> a
     4242:4242:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):999 -> a
     4243:4248:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):999:1004 -> a
     4249:4250:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1089:1090 -> a
@@ -27569,7 +27405,7 @@
     4266:4281:com.android.tools.r8.graph.ProgramMethod toPrivateSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1118:1133 -> a
     4282:4285:void lambda$toPrivateSyntheticMethod$5(com.android.tools.r8.graph.MethodAccessFlags):1128:1131 -> a
     4286:4286:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1138:1138 -> a
-    4287:4287: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):322:322 -> a
+    4287:4287: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):309:309 -> a
     4287:4287:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1138 -> a
     4288:4303:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1139:1154 -> a
     4304:4333:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1153:1182 -> a
@@ -27600,10 +27436,10 @@
     4431:4431:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1315:1315 -> a
     4431:4431:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983 -> a
     4432:4432:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):985:985 -> a
-    4433:4433:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    4433:4433:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     4433:4433:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):985 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4434:4434:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    4434:4434:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     4434:4434:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):985 -> a
     4435:4435:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):986:986 -> a
     4436:4437:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1041:1042 -> a
@@ -27781,7 +27617,7 @@
     14:14:com.android.tools.r8.graph.DexEncodedMethod$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):1464:1464 -> a
     15:15:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1469:1469 -> a
     16:33:com.android.tools.r8.graph.DexEncodedMethod$Builder rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1475:1492 -> a
-    34:34:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    34:34:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     34:34:com.android.tools.r8.graph.DexEncodedMethod$Builder rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1493 -> a
     35:44:com.android.tools.r8.graph.DexEncodedMethod$Builder rewriteParameterAnnotations(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.ArgumentInfoCollection):1494:1503 -> a
     45:45:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1469:1469 -> a
@@ -27819,7 +27655,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableMethodNotNullCheck():1579:1579 -> d
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableParameterAnnotationListCheck():1584:1584 -> e
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetIsLibraryMethodOverride():1447:1447 -> f
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.xg:
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.sg:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -27900,10 +27736,10 @@
     406:406:java.lang.String toSourceString():200:200 -> l0
     202:202:java.lang.String toSourceString():200:200 -> l0
     203:203:java.lang.String toSourceString():0:0 -> l0
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":407,"2":408,"3":409}}
-    407:407:java.lang.String toSourceString():200:200 -> l0
-    408:408:java.lang.String toSourceString():200:200 -> l0
-    409:409:java.lang.String toSourceString():200:200 -> l0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":404,"2":405,"3":406}}
+    404:404:java.lang.String toSourceString():200:200 -> l0
+    405:405:java.lang.String toSourceString():200:200 -> l0
+    406:406:java.lang.String toSourceString():200:200 -> l0
     403:403:java.lang.String toSourceString():200:200 -> l0
     1:3:int computeHashCode():124:126 -> m0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():66:66 -> n
@@ -27930,513 +27766,512 @@
     1:1:java.lang.String toSourceString():48:48 -> l0
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.v0:
     com.android.tools.r8.graph.DexString invokeMethodName -> A0
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> C3
     com.android.tools.r8.graph.DexString startsWithMethodName -> Q
-    com.android.tools.r8.graph.DexString lambdaInstanceFieldName -> b1
-    com.android.tools.r8.graph.DexType optionalType -> F2
-    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsJ$Type -> g3
-    com.android.tools.r8.graph.DexType iteratorType -> G4
+    com.android.tools.r8.graph.DexString javacLambdaMethodPrefix -> b1
+    com.android.tools.r8.graph.DexType optionalDoubleType -> F2
+    com.android.tools.r8.graph.DexType optionalConversionsJ$Type -> g3
+    com.android.tools.r8.graph.DexType listIteratorType -> G4
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> I0
+    java.util.Set libraryMethodsReturningReceiver -> W4
     com.android.tools.r8.graph.DexString getSimpleNameName -> r0
     com.android.tools.r8.graph.DexString floatDescriptor -> A
     java.util.Map types -> c
-    com.android.tools.r8.graph.DexType annotationThrows -> x4
-    com.android.tools.r8.graph.DexType iterableType -> V1
-    com.android.tools.r8.graph.DexType setType -> w2
-    com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers stringConcatFactoryMembers -> Q4
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> l4
+    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> x4
+    com.android.tools.r8.graph.DexType mathType -> V1
+    com.android.tools.r8.graph.DexType mapType -> w2
+    java.util.IdentityHashMap internalSentinels -> e5
     com.android.tools.r8.graph.DexString assertionsDisabled -> z0
-    com.android.tools.r8.graph.DexType annotationDefault -> p4
-    com.android.tools.r8.graph.DexType recordType -> N1
-    com.android.tools.r8.graph.DexType varHandleType -> o2
-    com.android.tools.r8.graph.DexType boxedLongType -> F1
+    java.util.List typeSpecificBuffers -> K2
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> p4
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> Q4
+    com.android.tools.r8.graph.DexType recordTagType -> N1
+    com.android.tools.r8.graph.DexType methodHandleType -> o2
+    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> J3
+    com.android.tools.r8.graph.DexString unknownTypeName -> d5
+    com.android.tools.r8.graph.DexType boxedShortType -> F1
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> a0
     com.android.tools.r8.graph.DexString endsWithMethodName -> R
-    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> W3
-    com.android.tools.r8.graph.DexType closeableType -> g2
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> k4
+    com.android.tools.r8.graph.DexType zipFileType -> g2
     com.android.tools.r8.graph.DexString wrapperFieldName -> i0
-    com.android.tools.r8.graph.DexType intArrayType -> w1
+    com.android.tools.r8.graph.DexType longArrayType -> w1
     com.android.tools.r8.graph.DexString throwableDescriptor -> Q0
     com.android.tools.r8.graph.DexString intDescriptor -> B
     java.util.Map fields -> d
-    com.android.tools.r8.graph.DexType noSuchMethodErrorType -> W2
-    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> x3
-    com.android.tools.r8.graph.DexType longType -> o1
+    com.android.tools.r8.graph.DexType npeType -> W2
+    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> x3
+    java.util.Map unboxPrimitiveMethod -> R4
+    com.android.tools.r8.graph.DexType shortType -> o1
     com.android.tools.r8.graph.DexString temporaryConstructorMethodPrefix -> Y0
-    com.android.tools.r8.graph.DexType intConsumer -> O2
-    com.android.tools.r8.graph.DexType javaUtilListType -> p3
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> D3
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> R3
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> K3
+    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> Y3
+    com.android.tools.r8.graph.DexType retentionType -> O2
+    com.android.tools.r8.graph.DexType javaUtilLocaleType -> p3
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> D3
     com.android.tools.r8.graph.DexString equalsMethodName -> S
-    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsJ$Type -> f3
-    com.android.tools.r8.graph.DexType runnableType -> E2
+    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsJ$Type -> f3
+    com.android.tools.r8.graph.DexType optionalType -> E2
     com.android.tools.r8.graph.DexString classDescriptor -> H0
-    com.android.tools.r8.graph.DexType typeDescriptorType -> F4
-    com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers androidUtilSparseArrayMembers -> h4
+    com.android.tools.r8.graph.DexType iteratorType -> F4
+    com.android.tools.r8.graph.DexItemFactory$RecordMembers recordMembers -> N3
     com.android.tools.r8.graph.DexString arraysDescriptor -> P0
     com.android.tools.r8.graph.DexString getCanonicalNameName -> q0
-    com.android.tools.r8.graph.DexType collectionsType -> U1
-    com.android.tools.r8.graph.DexType listType -> v2
+    com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers stringConcatFactoryMembers -> P4
+    com.android.tools.r8.graph.DexType iterableType -> U1
+    com.android.tools.r8.graph.DexType setType -> v2
     com.android.tools.r8.graph.DexString longDescriptor -> C
-    java.util.List typeSpecificBuffers -> L2
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> w4
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> k4
+    com.android.tools.r8.graph.DexType annotationThrows -> w4
     com.android.tools.r8.graph.DexString newInstanceName -> y0
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> d4
-    com.android.tools.r8.graph.DexType objectType -> M1
-    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> n2
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> R4
+    com.android.tools.r8.graph.DexType recordType -> M1
+    com.android.tools.r8.graph.DexType varHandleType -> n2
     java.util.Map protos -> e
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers objectMethodsMembers -> O4
-    com.android.tools.r8.graph.DexString thisName -> a1
-    com.android.tools.r8.graph.DexType boxedIntType -> E1
-    com.android.tools.r8.graph.DexType autoCloseableType -> f2
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> F3
+    com.android.tools.r8.graph.DexType annotationDefault -> o4
+    com.android.tools.r8.graph.DexString lambdaInstanceFieldName -> a1
+    com.android.tools.r8.graph.DexType boxedLongType -> E1
+    com.android.tools.r8.graph.DexType closeableType -> f2
     com.android.tools.r8.graph.DexString hashCodeMethodName -> T
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> j4
     com.android.tools.r8.graph.DexString convertMethodName -> h0
     com.android.tools.r8.graph.DexString getNameName -> p0
-    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> V2
-    com.android.tools.r8.graph.DexType androidOsBundleType -> w3
-    com.android.tools.r8.graph.DexType floatArrayType -> v1
+    com.android.tools.r8.graph.DexType noSuchMethodErrorType -> V2
+    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> w3
+    com.android.tools.r8.graph.DexType intArrayType -> v1
     com.android.tools.r8.graph.DexString shortDescriptor -> D
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> h
     com.android.tools.r8.graph.DexString classConstructorMethodName -> X0
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> L3
-    com.android.tools.r8.graph.DexType longConsumer -> N2
-    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> o3
-    com.android.tools.r8.graph.DexType intType -> n1
-    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> Z3
+    com.android.tools.r8.graph.DexType intConsumer -> N2
+    com.android.tools.r8.graph.DexType javaUtilListType -> o3
+    com.android.tools.r8.graph.DexType longType -> n1
     java.util.Map methods -> f
     com.android.tools.r8.graph.DexString assertionErrorDescriptor -> C0
     java.util.concurrent.ConcurrentHashMap classTypeInterfaces -> u
-    com.android.tools.r8.graph.DexString enabledFieldName -> d1
-    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsJ$Type -> e3
-    com.android.tools.r8.graph.DexType objectMethodsType -> E4
+    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> d1
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> f4
+    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsJ$Type -> e3
+    com.android.tools.r8.graph.DexType typeDescriptorType -> E4
     java.util.Map setFiles -> o
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> E3
-    com.android.tools.r8.graph.DexType consumerType -> D2
+    com.android.tools.r8.graph.DexType runnableType -> D2
     com.android.tools.r8.graph.DexString constructorDescriptor -> K0
-    java.util.Set libraryMethodsReturningNonNull -> Y4
-    com.android.tools.r8.graph.DexItemFactory$RecordMembers recordMembers -> O3
-    com.android.tools.r8.graph.DexItemFactory$JavaLangAnnotationRetentionPolicyMembers javaLangAnnotationRetentionPolicyMembers -> Y3
+    com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers androidUtilSparseArrayMembers -> g4
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> Y4
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> t0
-    com.android.tools.r8.graph.DexType annotationSignature -> v4
-    com.android.tools.r8.graph.DexType objectsType -> T1
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> u2
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> v4
+    com.android.tools.r8.graph.DexType collectionsType -> T1
+    com.android.tools.r8.graph.DexType listType -> u2
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> T3
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> c4
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> v
-    com.android.tools.r8.graph.DexType serializedLambdaType -> n4
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> Z3
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers objectMethodsMembers -> N4
     com.android.tools.r8.graph.DexString isEmptyMethodName -> M
-    com.android.tools.r8.graph.DexType stringArrayType -> L1
-    com.android.tools.r8.graph.DexType javaLangSystemType -> m2
+    com.android.tools.r8.graph.DexType objectType -> L1
+    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> m2
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> E3
     com.android.tools.r8.graph.DexString substringName -> c0
-    java.util.Set libraryTypesAssumedToBePresent -> a5
+    java.util.Set libraryClassesWithoutStaticInitialization -> a5
     java.util.concurrent.ConcurrentHashMap referenceTypes -> t
-    com.android.tools.r8.graph.DexType methodType -> e2
-    com.android.tools.r8.graph.DexType boxedFloatType -> D1
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> m4
+    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> P3
+    com.android.tools.r8.graph.DexType autoCloseableType -> e2
+    boolean $assertionsDisabled -> f5
+    com.android.tools.r8.graph.DexType boxedIntType -> D1
     com.android.tools.r8.graph.DexString finalizeMethodName -> k0
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> T4
-    com.android.tools.r8.graph.DexType doubleArrayType -> u1
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> T4
+    com.android.tools.r8.graph.DexType floatArrayType -> u1
     com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> S0
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> m
-    com.android.tools.r8.graph.DexType icceType -> U2
-    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> v3
-    com.android.tools.r8.graph.DexType floatType -> m1
-    com.android.tools.r8.graph.DexType unsafeType -> N4
-    com.android.tools.r8.graph.DexType doubleConsumer -> M2
-    com.android.tools.r8.graph.DexType javaUtilComparatorType -> n3
+    com.android.tools.r8.graph.DexType noClassDefFoundErrorType -> U2
+    com.android.tools.r8.graph.DexType androidOsBundleType -> v3
+    com.android.tools.r8.graph.DexType intType -> m1
+    com.android.tools.r8.graph.DexType longConsumer -> M2
+    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> n3
     com.android.tools.r8.graph.DexString lengthMethodName -> N
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> h4
     java.util.Map setInlineFrames -> q
-    com.android.tools.r8.graph.DexString javacLambdaMethodPrefix -> c1
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> g4
+    com.android.tools.r8.graph.DexString enabledFieldName -> c1
     com.android.tools.r8.graph.DexString invokeExactMethodName -> B0
-    com.android.tools.r8.graph.DexType supplierType -> C2
-    com.android.tools.r8.graph.DexType lookupType -> D4
-    com.android.tools.r8.graph.DexType timeConversionsType -> d3
+    com.android.tools.r8.graph.DexType consumerType -> C2
+    com.android.tools.r8.graph.DexType objectMethodsType -> D4
+    com.android.tools.r8.graph.DexItemFactory$ByteMembers byteMembers -> F3
+    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsJ$Type -> d3
     com.android.tools.r8.graph.DexString classArrayDescriptor -> J0
-    java.util.Set libraryMethodsReturningReceiver -> X4
+    com.android.tools.r8.graph.DexItemFactory$JavaLangAnnotationRetentionPolicyMembers javaLangAnnotationRetentionPolicyMembers -> X3
+    java.util.Set libraryMethodsReturningNonNull -> X4
     com.android.tools.r8.graph.DexString getTypeNameName -> s0
-    com.android.tools.r8.graph.DexType annotationType -> S1
-    com.android.tools.r8.graph.DexType serviceLoaderType -> t2
-    java.util.IdentityHashMap internalSentinels -> f5
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> u4
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> U3
-    com.android.tools.r8.graph.DexType stringType -> K1
-    com.android.tools.r8.graph.DexType javaLangReflectArrayType -> l2
-    com.android.tools.r8.graph.DexString unknownTypeName -> e5
+    com.android.tools.r8.graph.DexType objectsType -> S1
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> t2
+    com.android.tools.r8.graph.DexType annotationSignature -> u4
+    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> a4
+    com.android.tools.r8.graph.DexType stringArrayType -> K1
+    com.android.tools.r8.graph.DexType javaLangSystemType -> l2
     com.android.tools.r8.graph.DexString concatMethodName -> O
+    com.android.tools.r8.graph.DexType serializedLambdaType -> m4
     com.android.tools.r8.graph.DexString containsMethodName -> P
     com.android.tools.r8.graph.DexString cloneMethodName -> b0
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> n
-    com.android.tools.r8.graph.DexType fieldType -> d2
-    com.android.tools.r8.graph.DexItemFactory$ShortMembers shortMembers -> P3
-    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> Q3
-    boolean $assertionsDisabled -> g5
-    com.android.tools.r8.graph.DexType boxedDoubleType -> C1
+    com.android.tools.r8.graph.DexType methodType -> d2
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> l4
+    com.android.tools.r8.graph.DexType boxedFloatType -> C1
     com.android.tools.r8.graph.DexString getClassMethodName -> j0
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> S4
     com.android.tools.r8.graph.DexString npeDescriptor -> R0
     java.util.Map strings -> b
-    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> T2
-    com.android.tools.r8.graph.DexType androidOsBuildType -> u3
-    com.android.tools.r8.graph.DexType charArrayType -> t1
-    java.util.Map unboxPrimitiveMethod -> S4
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> a4
-    com.android.tools.r8.graph.DexString syntheticConstructorMethodPrefix -> Z0
-    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> m3
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> i4
-    com.android.tools.r8.graph.DexType doubleType -> l1
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> M4
-    com.android.tools.r8.graph.DexType externalizableType -> K4
+    com.android.tools.r8.graph.DexType icceType -> T2
+    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> u3
+    com.android.tools.r8.graph.DexType doubleArrayType -> t1
+    com.android.tools.r8.graph.DexString thisName -> Z0
+    com.android.tools.r8.graph.DexType doubleConsumer -> L2
+    com.android.tools.r8.graph.DexType javaUtilComparatorType -> m3
+    com.android.tools.r8.graph.DexType floatType -> l1
+    com.android.tools.r8.graph.DexType unsafeType -> M4
+    com.android.tools.r8.graph.DexType comparableType -> K4
     com.android.tools.r8.graph.DexString stringDescriptor -> E0
-    com.android.tools.r8.graph.DexString valueString -> f1
-    com.android.tools.r8.graph.DexType comparatorType -> B2
-    com.android.tools.r8.graph.DexItemFactory$ByteMembers byteMembers -> G3
-    com.android.tools.r8.graph.DexType optionalConversionsType -> c3
+    com.android.tools.r8.graph.DexString kindString -> f1
+    com.android.tools.r8.graph.DexType supplierType -> B2
+    com.android.tools.r8.graph.DexType timeConversionsType -> c3
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> Y
-    com.android.tools.r8.graph.DexType nullValueType -> d5
     com.android.tools.r8.graph.DexString doubleDescriptor -> z
-    com.android.tools.r8.graph.DexType callSiteType -> C4
+    com.android.tools.r8.graph.DexType lookupType -> C4
     com.android.tools.r8.graph.DexString methodDescriptor -> M0
-    com.android.tools.r8.graph.DexType classType -> Z1
+    com.android.tools.r8.graph.DexType packageType -> Z1
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> v0
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> t4
-    com.android.tools.r8.graph.DexType enumType -> R1
-    com.android.tools.r8.graph.DexType proxyType -> s2
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> t4
+    com.android.tools.r8.graph.DexType annotationType -> R1
+    com.android.tools.r8.graph.DexType serviceLoaderType -> s2
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> I
-    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> b4
-    com.android.tools.r8.graph.DexType charSequenceArrayType -> J1
-    com.android.tools.r8.graph.DexType javaLangAnnotationRetentionPolicyType -> k2
-    com.android.tools.r8.graph.DexType boxedCharType -> B1
+    com.android.tools.r8.graph.DexType stringType -> J1
+    com.android.tools.r8.graph.DexType javaLangReflectArrayType -> k2
+    com.android.tools.r8.graph.DexType boxedDoubleType -> B1
     com.android.tools.r8.graph.DexString valueOfMethodName -> e0
-    com.android.tools.r8.graph.DexType androidUtilSparseArrayType -> C3
-    com.android.tools.r8.graph.DexItemFactory$BufferMembers bufferMembers -> N3
-    com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> R3
-    com.android.tools.r8.graph.DexType constructorType -> c2
+    com.android.tools.r8.graph.DexItemFactory$ShortMembers shortMembers -> O3
+    com.android.tools.r8.graph.DexType fieldType -> c2
     com.android.tools.r8.graph.DexString compareToMethodName -> Z
     com.android.tools.r8.graph.DexString nameMethodName -> m0
-    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> V4
-    com.android.tools.r8.graph.DexType byteArrayType -> s1
+    java.util.Map libraryMethodsNonNullParamOrThrow -> V4
+    com.android.tools.r8.graph.DexType charArrayType -> s1
     com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> U0
-    com.android.tools.r8.graph.DexType illegalAccessErrorType -> S2
-    com.android.tools.r8.graph.DexType javaUtilSetType -> t3
+    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> S2
+    com.android.tools.r8.graph.DexType androidOsBuildType -> t3
     com.android.tools.r8.graph.DexString waitMethodName -> J
-    com.android.tools.r8.graph.DexType charType -> k1
-    com.android.tools.r8.graph.DexType comparableType -> L4
-    com.android.tools.r8.graph.DexType bufferType -> K2
-    com.android.tools.r8.graph.DexType javaNioByteOrderType -> l3
-    com.android.tools.r8.graph.DexType javaIoFileType -> j3
-    com.android.tools.r8.graph.DexString throwableArrayDescriptor -> e1
-    com.android.tools.r8.graph.DexType optionalLongType -> I2
+    com.android.tools.r8.graph.DexType doubleType -> k1
+    java.util.List libraryMembersCollection -> i4
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> L4
+    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> l3
+    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> j3
+    com.android.tools.r8.graph.DexString valueString -> e1
+    com.android.tools.r8.graph.DexType streamType -> I2
     com.android.tools.r8.graph.DexString charSequenceDescriptor -> D0
-    com.android.tools.r8.graph.DexType serializableType -> J4
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> Z4
-    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsType -> b3
+    com.android.tools.r8.graph.DexType externalizableType -> J4
+    java.util.Set libraryTypesAssumedToBePresent -> Z4
+    com.android.tools.r8.graph.DexType nullValueType -> c5
+    com.android.tools.r8.graph.DexType optionalConversionsType -> b3
     com.android.tools.r8.graph.DexString fieldDescriptor -> L0
-    com.android.tools.r8.graph.DexType collectionType -> A2
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> B4
+    com.android.tools.r8.graph.DexType comparatorType -> A2
+    com.android.tools.r8.graph.DexType callSiteType -> B4
     com.android.tools.r8.graph.DexDebugEvent$Default zeroChangeDefaultEvent -> r
-    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> Y1
-    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> z2
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> o4
+    com.android.tools.r8.graph.DexType classType -> Y1
+    com.android.tools.r8.graph.DexType collectionType -> z2
     com.android.tools.r8.graph.DexDebugEvent$Default oneChangeDefaultEvent -> s
     com.android.tools.r8.graph.DexString getFieldName -> u0
-    com.android.tools.r8.graph.DexType classArrayType -> Q1
-    com.android.tools.r8.graph.DexType invocationHandlerType -> r2
-    com.android.tools.r8.kotlin.Kotlin kotlin -> e4
-    com.android.tools.r8.graph.DexType annotationInnerClass -> s4
+    com.android.tools.r8.graph.DexType enumType -> Q1
+    com.android.tools.r8.graph.DexType proxyType -> r2
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> s4
     com.android.tools.r8.graph.DexString notifyMethodName -> K
-    com.android.tools.r8.graph.DexType charSequenceType -> I1
-    com.android.tools.r8.graph.DexType stringBufferType -> j2
+    com.android.tools.r8.graph.DexType charSequenceArrayType -> I1
+    com.android.tools.r8.graph.DexType javaLangAnnotationRetentionPolicyType -> j2
     com.android.tools.r8.graph.DexString trimName -> d0
-    java.util.Set libraryClassesWithoutStaticInitialization -> b5
-    com.android.tools.r8.graph.DexType boxedByteType -> A1
-    com.android.tools.r8.graph.DexType classLoaderType -> b2
+    com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> Q3
+    com.android.tools.r8.graph.DexItemFactory$BufferMembers bufferMembers -> M3
+    com.android.tools.r8.graph.DexType boxedCharType -> A1
+    com.android.tools.r8.graph.DexType constructorType -> b2
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> e4
     com.android.tools.r8.graph.DexString ordinalMethodName -> l0
-    com.android.tools.r8.graph.DexType androidViewViewType -> B3
-    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsType -> Z2
-    com.android.tools.r8.graph.DexType boxedBooleanType -> z1
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> U4
+    com.android.tools.r8.graph.DexType androidUtilSparseArrayType -> B3
+    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsType -> Z2
+    com.android.tools.r8.graph.DexType boxedByteType -> z1
+    com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers javaLangReflectArrayMembers -> W3
+    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> U4
     com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> T0
-    com.android.tools.r8.graph.DexType throwableType -> R2
-    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> s3
-    com.android.tools.r8.graph.DexType booleanArrayType -> r1
-    java.util.List libraryMembersCollection -> j4
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> U3
+    com.android.tools.r8.graph.DexType illegalAccessErrorType -> R2
+    com.android.tools.r8.graph.DexType javaUtilSetType -> s3
+    com.android.tools.r8.graph.DexType byteArrayType -> r1
     com.android.tools.r8.graph.DexString notifyAllMethodName -> L
-    com.android.tools.r8.graph.DexType streamType -> J2
-    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> k3
-    com.android.tools.r8.graph.DexType byteType -> j1
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> P4
-    com.android.tools.r8.graph.DexType timeConversionsJ$Type -> i3
-    com.android.tools.r8.graph.DexType enumerationType -> I4
-    com.android.tools.r8.graph.DexType optionalIntType -> H2
+    com.android.tools.r8.graph.DexType bufferType -> J2
+    com.android.tools.r8.graph.DexType javaNioByteOrderType -> k3
+    com.android.tools.r8.graph.DexType charType -> j1
+    com.android.tools.r8.graph.DexType javaIoFileType -> i3
+    com.android.tools.r8.graph.DexType serializableType -> I4
+    com.android.tools.r8.graph.DexType booleanType -> h1
+    com.android.tools.r8.graph.DexType optionalLongType -> H2
     com.android.tools.r8.graph.DexString identityHashCodeName -> U
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> G0
-    com.android.tools.r8.graph.DexString dalvikAnnotationOptimizationPrefix -> h1
-    com.android.tools.r8.graph.DexType intSummaryStatisticsConversionsType -> a3
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> A4
-    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> M3
+    com.android.tools.r8.graph.DexType longSummaryStatisticsConversionsType -> a3
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> A4
     com.android.tools.r8.graph.DexString listDescriptor -> O0
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> z4
-    com.android.tools.r8.graph.DexType strictMathType -> X1
-    com.android.tools.r8.graph.DexType mapEntryType -> y2
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> z4
+    com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> X1
+    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> y2
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> n4
+    com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> G3
+    com.android.tools.r8.kotlin.Kotlin kotlin -> d4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> i
     com.android.tools.r8.graph.DexString voidDescriptor -> E
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> x0
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> r4
-    com.android.tools.r8.graph.DexType objectArrayType -> P1
-    com.android.tools.r8.graph.DexType methodTypeType -> q2
-    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> I3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> r4
+    com.android.tools.r8.graph.DexType classArrayType -> P1
+    com.android.tools.r8.graph.DexType invocationHandlerType -> q2
     java.util.Map methodHandles -> g
-    com.android.tools.r8.graph.DexType stringBuilderType -> i2
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> T3
-    com.android.tools.r8.graph.DexType boxedNumberType -> H1
+    com.android.tools.r8.graph.DexType stringBufferType -> i2
+    com.android.tools.r8.graph.DexType charSequenceType -> H1
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> V
     com.android.tools.r8.graph.DexString booleanDescriptor -> w
     com.android.tools.r8.graph.DexString internMethodName -> g0
-    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> J3
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> f4
-    com.android.tools.r8.graph.DexType packageType -> a2
-    com.android.tools.r8.graph.DexType androidUtilPropertyType -> A3
-    com.android.tools.r8.graph.DexType shortArrayType -> y1
+    com.android.tools.r8.graph.DexType classLoaderType -> a2
+    boolean skipNameValidationForTesting -> b5
+    com.android.tools.r8.graph.DexType androidViewViewType -> A3
+    com.android.tools.r8.graph.DexType boxedBooleanType -> y1
     com.android.tools.r8.graph.DexString forNameMethodName -> o0
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> V3
-    com.android.tools.r8.graph.DexType kotlinMetadataType -> Y2
-    com.android.tools.r8.graph.DexType androidUtilLogType -> z3
-    com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers javaLangReflectArrayMembers -> X3
+    com.android.tools.r8.graph.DexType doubleSummaryStatisticsConversionsType -> Y2
+    com.android.tools.r8.graph.DexType androidUtilPropertyType -> z3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> j
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> b4
     com.android.tools.r8.graph.DexString descriptorSeparator -> F
-    com.android.tools.r8.graph.DexType voidType -> q1
+    com.android.tools.r8.graph.DexType booleanArrayType -> q1
     com.android.tools.r8.graph.DexString constructorMethodName -> W0
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> Q2
-    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> r3
+    com.android.tools.r8.graph.DexType throwableType -> Q2
+    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> r3
     com.android.tools.r8.graph.DexDebugEvent$SetOutlineFrame setOutlineFrame -> p
-    com.android.tools.r8.graph.DexType booleanType -> i1
-    com.android.tools.r8.graph.DexType optionalDoubleType -> G2
-    com.android.tools.r8.graph.DexType listIteratorType -> H4
-    com.android.tools.r8.graph.DexType optionalConversionsJ$Type -> h3
-    com.android.tools.r8.graph.DexString kindString -> g1
+    com.android.tools.r8.graph.DexType byteType -> i1
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> O4
+    com.android.tools.r8.graph.DexType optionalIntType -> G2
+    com.android.tools.r8.graph.DexType enumerationType -> H4
+    com.android.tools.r8.graph.DexType timeConversionsJ$Type -> h3
+    com.android.tools.r8.graph.DexString dalvikAnnotationOptimizationPrefix -> g1
     com.android.tools.r8.graph.DexString objectDescriptor -> F0
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> W
     com.android.tools.r8.graph.DexString byteDescriptor -> x
     com.android.tools.r8.graph.DexString enumDescriptor -> N0
-    com.android.tools.r8.graph.DexType mathType -> W1
-    com.android.tools.r8.graph.DexType mapType -> x2
+    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> L3
+    com.android.tools.r8.graph.DexType strictMathType -> W1
+    com.android.tools.r8.graph.DexType mapEntryType -> x2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> k
-    com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> H3
-    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> y4
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> y4
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> G
     com.android.tools.r8.graph.DexString getMethodName -> w0
-    com.android.tools.r8.graph.DexType recordTagType -> O1
-    com.android.tools.r8.graph.DexType methodHandleType -> p2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> q4
-    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> K3
-    com.android.tools.r8.graph.DexType zipFileType -> h2
-    com.android.tools.r8.graph.DexType boxedShortType -> G1
+    com.android.tools.r8.graph.DexType objectArrayType -> O1
+    com.android.tools.r8.graph.DexType methodTypeType -> p2
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> q4
+    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> H3
+    com.android.tools.r8.graph.DexType stringBuilderType -> h2
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> S3
+    com.android.tools.r8.graph.DexType boxedNumberType -> G1
+    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> V3
     com.android.tools.r8.graph.DexString toStringMethodName -> f0
+    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> I3
     com.android.tools.r8.graph.DexString indexOfMethodName -> X
     com.android.tools.r8.graph.DexString charDescriptor -> y
     java.util.Set possibleCompilerSynthesizedTypes -> a
-    boolean skipNameValidationForTesting -> c5
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> n0
-    com.android.tools.r8.graph.DexType npeType -> X2
-    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> y3
-    com.android.tools.r8.graph.DexType longArrayType -> x1
+    com.android.tools.r8.graph.DexType kotlinMetadataType -> X2
+    com.android.tools.r8.graph.DexType androidUtilLogType -> y3
+    com.android.tools.r8.graph.DexType shortArrayType -> x1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> l
-    java.util.Map libraryMethodsNonNullParamOrThrow -> W4
     com.android.tools.r8.graph.DexString newUpdaterName -> V0
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> c4
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> H
-    com.android.tools.r8.graph.DexType retentionType -> P2
-    com.android.tools.r8.graph.DexType javaUtilLocaleType -> q3
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> S3
-    com.android.tools.r8.graph.DexType shortType -> p1
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> P2
+    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> q3
+    com.android.tools.r8.graph.DexType voidType -> p1
     1:52:void <clinit>():72:123 -> <clinit>
     1:1:void <init>():127:127 -> <init>
-    2:653:void <init>():82:733 -> <init>
-    654:740:void <init>():723:809 -> <init>
-    741:757:void <init>():799:815 -> <init>
-    758:845:void <init>():812:899 -> <init>
-    846:846:void <init>():128:128 -> <init>
+    2:651:void <init>():82:731 -> <init>
+    652:738:void <init>():721:807 -> <init>
+    739:755:void <init>():797:813 -> <init>
+    756:843:void <init>():810:897 -> <init>
+    844:844:void <init>():128:128 -> <init>
     com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$8(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
     1:1:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.DexTypeList.getBacking():63:63 -> a
-    1:1:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):2616 -> a
+    1:1:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):2614 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:7:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2708:2713 -> a
-    2:7:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):2616 -> a
-    8:8:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):2616:2616 -> a
+    2:7:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2706:2711 -> a
+    2:7:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):2614 -> a
+    8:8:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):2614:2614 -> a
     9:9:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):132:132 -> a
-    10:10:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> a
-    10:10:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2452 -> a
+    10:10:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
+    10:10:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2450 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> a
-    11:11:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2452 -> a
-    12:12:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2452:2452 -> a
-    13:14:com.android.tools.r8.graph.DexMethod createUnboxMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):748:749 -> a
+    11:11:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
+    11:11:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2450 -> a
+    12:12:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2450:2450 -> a
+    13:14:com.android.tools.r8.graph.DexMethod createUnboxMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):746:747 -> a
     15:15:com.android.tools.r8.graph.DexDebugEvent$Default com.android.tools.r8.graph.DexDebugEvent$Default.create(int,int):756:756 -> a
-    15:15:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2810 -> a
-    16:16:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2810:2810 -> a
-    17:18:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):774:775 -> a
-    19:30:java.util.Set boxedValueOfMethods():784:795 -> a
-    31:33:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):787:789 -> a
-    34:34:void setSkipNameValidationForTesting(boolean):902:902 -> a
-    35:35:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2213:2213 -> a
+    15:15:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2808 -> a
+    16:16:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2808:2808 -> a
+    17:18:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):772:773 -> a
+    19:30:java.util.Set boxedValueOfMethods():782:793 -> a
+    31:33:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):785:787 -> a
+    34:34:void setSkipNameValidationForTesting(boolean):900:900 -> a
+    35:35:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2211:2211 -> a
     36:36:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):132:132 -> a
-    36:36:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2214 -> a
-    37:38:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2214:2215 -> a
-    39:39:com.android.tools.r8.graph.DexString createString(int,byte[]):2221:2221 -> a
-    40:40:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2261:2261 -> a
+    36:36:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2212 -> a
+    37:38:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):2212:2213 -> a
+    39:39:com.android.tools.r8.graph.DexString createString(int,byte[]):2219:2219 -> a
+    40:40:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2259:2259 -> a
     41:41:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":56,"2":57,"3":58}}
-    56:56:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2234:2234 -> a
-    56:56:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2262 -> a
-    57:57:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2234:2234 -> a
-    57:57:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2262 -> a
-    58:58:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2234:2234 -> a
-    58:58:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2262 -> a
-    42:42:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2236:2236 -> a
-    42:42:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2262 -> a
-    43:43:java.lang.String escapeMemberString(java.lang.String):2230:2230 -> a
-    43:43:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2236 -> a
-    43:43:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2262 -> a
-    44:51:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2236:2243 -> a
-    44:51:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2262 -> a
-    52:55:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2262:2265 -> a
-    59:59:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2333:2333 -> a
-    60:60:com.android.tools.r8.graph.DexMethod internalCreateFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2358:2358 -> a
-    60:60:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2334 -> a
-    61:61:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2349:2349 -> a
-    61:61:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2339 -> a
-    62:62:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2349:2349 -> a
-    63:63:com.android.tools.r8.graph.DexMethod internalCreateFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2372:2372 -> a
-    64:68:java.util.Optional lambda$internalCreateFreshMethodNameWithHolder$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2374:2378 -> a
-    69:69:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2396:2396 -> a
-    70:70:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2248:2248 -> a
-    70:70:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2396 -> a
-    71:71:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2396:2396 -> a
-    72:72:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2398:2398 -> a
+    56:56:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2232:2232 -> a
+    56:56:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2260 -> a
+    57:57:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2232:2232 -> a
+    57:57:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2260 -> a
+    58:58:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2232:2232 -> a
+    58:58:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2260 -> a
+    42:42:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2234:2234 -> a
+    42:42:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2260 -> a
+    43:43:java.lang.String escapeMemberString(java.lang.String):2228:2228 -> a
+    43:43:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2234 -> a
+    43:43:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2260 -> a
+    44:51:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2234:2241 -> a
+    44:51:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2260 -> a
+    52:55:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType,int):2260:2263 -> a
+    59:59:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2331:2331 -> a
+    60:60:com.android.tools.r8.graph.DexMethod internalCreateFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2356:2356 -> a
+    60:60:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2332 -> a
+    61:61:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2347:2347 -> a
+    61:61:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2337 -> a
+    62:62:com.android.tools.r8.graph.DexMethod createFreshMethodNameWithoutHolder(java.lang.String,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2347:2347 -> a
+    63:63:com.android.tools.r8.graph.DexMethod internalCreateFreshMethodNameWithHolder(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate,int):2370:2370 -> a
+    64:68:java.util.Optional lambda$internalCreateFreshMethodNameWithHolder$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2372:2376 -> a
+    69:69:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2394:2394 -> a
+    70:70:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2246:2246 -> a
+    70:70:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2394 -> a
+    71:71:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):2394:2394 -> a
+    72:72:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2396:2396 -> a
     73:73:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):21:21 -> a
-    73:73:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2398 -> a
-    74:77:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2399:2402 -> a
-    78:78:com.android.tools.r8.graph.DexField createFreshFieldNameWithoutHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2416:2416 -> a
-    79:80:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2427:2428 -> a
-    81:81:com.android.tools.r8.graph.DexMethod createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2439:2439 -> a
-    82:83:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2448:2449 -> a
-    84:87:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2457:2460 -> a
-    88:88:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2458:2458 -> a
-    89:107:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2466:2484 -> a
-    108:108:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2483:2483 -> a
-    109:109:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2528:2528 -> a
-    110:110:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2539:2539 -> a
-    110:110:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2528 -> a
-    111:115:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2560:2564 -> a
-    111:115:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2541 -> a
-    111:115:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2528 -> a
-    116:116:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2535:2535 -> a
-    117:117:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2539:2539 -> a
-    117:117:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2534 -> a
-    118:122:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2560:2564 -> a
-    118:122:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2541 -> a
-    118:122:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2534 -> a
-    123:123:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.references.ClassReference):2586:2586 -> a
-    124:125:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2594:2595 -> a
-    126:127:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):2600:2601 -> a
-    128:128:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2605:2605 -> a
-    129:131:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.references.FieldReference):2610:2612 -> a
-    132:132:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.references.FieldReference):2609:2609 -> a
-    133:134:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):2621:2622 -> a
-    135:135:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2634:2634 -> a
-    136:138:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2660:2662 -> a
-    136:138:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2484 -> a
-    139:142:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2661:2664 -> a
-    139:142:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2484 -> a
-    143:147:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2674:2678 -> a
-    148:152:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2695:2699 -> a
-    148:152:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2678 -> a
-    153:153:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction.put(java.lang.Object,java.lang.Object):41:41 -> a
-    153:153:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2699 -> a
-    153:153:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2678 -> a
-    154:156:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2702:2704 -> a
-    154:156:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2678 -> a
-    157:163:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2679:2685 -> a
-    164:168:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2684:2688 -> a
-    169:170:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2718:2719 -> a
-    171:171:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2723:2723 -> a
-    172:174:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2727:2729 -> a
-    175:185:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2728:2738 -> a
-    186:186:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2733:2733 -> a
-    187:187:void lambda$createMethod$7(com.android.tools.r8.graph.DexString[],com.android.tools.r8.references.TypeReference,int):2731:2731 -> a
-    188:190:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):2755:2757 -> a
-    191:191:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2767:2767 -> a
-    192:201:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2775:2784 -> a
-    202:204:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2792:2794 -> a
-    205:207:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2834:2836 -> a
-    208:210:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2841:2843 -> a
-    211:211:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2856:2856 -> a
-    212:219:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2893:2900 -> a
-    220:251:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2899:2930 -> a
-    252:257:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2907:2912 -> a
-    258:268:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AppView.isInterface(com.android.tools.r8.graph.DexType):310:320 -> a
-    258:268:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2913 -> a
-    269:274:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2913:2918 -> a
-    275:289:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2914:2928 -> a
-    290:290:com.android.tools.r8.ir.analysis.type.InterfaceCollection getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2935:2935 -> a
-    291:291:void forAllTypes(java.util.function.Consumer):2945:2945 -> a
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> b
-    1:1:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2461 -> b
+    73:73:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2396 -> a
+    74:77:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2397:2400 -> a
+    78:78:com.android.tools.r8.graph.DexField createFreshFieldNameWithoutHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2414:2414 -> a
+    79:80:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.util.function.Predicate,com.android.tools.r8.graph.DexString):2425:2426 -> a
+    81:81:com.android.tools.r8.graph.DexMethod createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2437:2437 -> a
+    82:83:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,java.util.List,java.util.function.Predicate):2446:2447 -> a
+    84:87:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2455:2458 -> a
+    88:88:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):2456:2456 -> a
+    89:107:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2464:2482 -> a
+    108:108:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,java.util.List,java.util.function.Function):2481:2481 -> a
+    109:109:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2526:2526 -> a
+    110:110:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2537:2537 -> a
+    110:110:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2526 -> a
+    111:115:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2558:2562 -> a
+    111:115:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2539 -> a
+    111:115:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):2526 -> a
+    116:116:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2533:2533 -> a
+    117:117:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2537:2537 -> a
+    117:117:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2532 -> a
+    118:122:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2558:2562 -> a
+    118:122:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2539 -> a
+    118:122:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):2532 -> a
+    123:123:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.references.ClassReference):2584:2584 -> a
+    124:125:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2592:2593 -> a
+    126:127:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):2598:2599 -> a
+    128:128:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2603:2603 -> a
+    129:131:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.references.FieldReference):2608:2610 -> a
+    132:132:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.references.FieldReference):2607:2607 -> a
+    133:134:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):2619:2620 -> a
+    135:135:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2632:2632 -> a
+    136:139:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2650:2653 -> a
+    140:142:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2652:2654 -> a
+    143:145:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2658:2660 -> a
+    143:145:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2482 -> a
+    146:149:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2659:2662 -> a
+    146:149:com.android.tools.r8.graph.DexProto lambda$createInstanceInitializerWithFreshProto$6(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2482 -> a
+    150:154:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2672:2676 -> a
+    155:159:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2693:2697 -> a
+    155:159:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2676 -> a
+    160:160:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction.put(java.lang.Object,java.lang.Object):41:41 -> a
+    160:160:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2697 -> a
+    160:160:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2676 -> a
+    161:163:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2700:2702 -> a
+    161:163:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2676 -> a
+    164:170:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2677:2683 -> a
+    171:175:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2682:2686 -> a
+    176:177:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2716:2717 -> a
+    178:178:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2721:2721 -> a
+    179:181:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2725:2727 -> a
+    182:192:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2726:2736 -> a
+    193:193:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.references.MethodReference):2731:2731 -> a
+    194:194:void lambda$createMethod$7(com.android.tools.r8.graph.DexString[],com.android.tools.r8.references.TypeReference,int):2729:2729 -> a
+    195:197:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean,com.android.tools.r8.graph.DexMethod):2753:2755 -> a
+    198:198:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2765:2765 -> a
+    199:208:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2773:2782 -> a
+    209:211:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2790:2792 -> a
+    212:214:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2832:2834 -> a
+    215:217:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2839:2841 -> a
+    218:218:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2854:2854 -> a
+    219:226:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2891:2898 -> a
+    227:258:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2897:2928 -> a
+    259:264:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2905:2910 -> a
+    265:275:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AppView.isInterface(com.android.tools.r8.graph.DexType):310:320 -> a
+    265:275:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2911 -> a
+    276:281:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2911:2916 -> a
+    282:296:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2912:2926 -> a
+    297:297:com.android.tools.r8.ir.analysis.type.InterfaceCollection getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2933:2933 -> a
+    298:299:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2936:2937 -> a
+    300:300:void forAllTypes(java.util.function.Consumer):2943:2943 -> a
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> b
+    1:1:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2459 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> b
-    2:2:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2461 -> b
-    3:3:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2461:2461 -> b
-    4:5:java.util.Map buildLibraryMethodsNonNullParamOrThrow():824:825 -> b
-    6:6:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1555:1555 -> b
-    6:6:java.util.Map buildLibraryMethodsNonNullParamOrThrow():825 -> b
+    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> b
+    2:2:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2459 -> b
+    3:3:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2459:2459 -> b
+    4:5:java.util.Map buildLibraryMethodsNonNullParamOrThrow():822:823 -> b
+    6:6:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1553:1553 -> b
+    6:6:java.util.Map buildLibraryMethodsNonNullParamOrThrow():823 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1555:1555 -> b
-    7:7:java.util.Map buildLibraryMethodsNonNullParamOrThrow():825 -> b
-    8:11:java.util.Map buildLibraryMethodsNonNullParamOrThrow():825:828 -> b
-    12:12:com.android.tools.r8.graph.DexString createString(java.lang.String):2226:2226 -> b
-    13:13:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2425:2425 -> b
-    14:14:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2248:2248 -> b
-    14:14:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2425 -> b
-    15:15:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2425:2425 -> b
-    16:16:com.android.tools.r8.graph.DexString lookupString(int,byte[]):2489:2489 -> b
-    17:17:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2539:2539 -> b
-    18:22:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2560:2564 -> b
-    18:22:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2541 -> b
-    23:23:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2569:2569 -> b
-    24:24:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2573:2573 -> b
-    25:25:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2629:2629 -> b
-    26:31:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2708:2713 -> b
-    26:31:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2630 -> b
-    32:32:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2627:2627 -> b
-    33:33:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2644:2644 -> b
-    34:37:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2652:2655 -> b
-    38:40:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2654:2656 -> b
-    41:43:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2798:2800 -> b
-    44:45:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2938:2939 -> b
-    1:1:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2548:2548 -> c
-    2:6:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2560:2564 -> c
-    2:6:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2549 -> c
-    7:11:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2560:2564 -> c
-    7:11:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):2556 -> c
-    12:12:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2578:2578 -> c
-    13:15:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2804:2806 -> c
-    16:18:void clearTypeElementsCache():2864:2866 -> c
-    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2512:2520 -> d
-    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2517:2517 -> d
+    7:7:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1553:1553 -> b
+    7:7:java.util.Map buildLibraryMethodsNonNullParamOrThrow():823 -> b
+    8:11:java.util.Map buildLibraryMethodsNonNullParamOrThrow():823:826 -> b
+    12:12:com.android.tools.r8.graph.DexString createString(java.lang.String):2224:2224 -> b
+    13:13:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2423:2423 -> b
+    14:14:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2246:2246 -> b
+    14:14:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2423 -> b
+    15:15:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.function.Predicate):2423:2423 -> b
+    16:16:com.android.tools.r8.graph.DexString lookupString(int,byte[]):2487:2487 -> b
+    17:17:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2537:2537 -> b
+    18:22:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2558:2562 -> b
+    18:22:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):2539 -> b
+    23:23:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2567:2567 -> b
+    24:24:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2571:2571 -> b
+    25:25:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2627:2627 -> b
+    26:31:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2706:2711 -> b
+    26:31:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2628 -> b
+    32:32:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2625:2625 -> b
+    33:33:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2642:2642 -> b
+    34:36:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2796:2798 -> b
+    1:1:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2546:2546 -> c
+    2:6:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2558:2562 -> c
+    2:6:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2547 -> c
+    7:11:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2558:2562 -> c
+    7:11:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):2554 -> c
+    12:12:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2576:2576 -> c
+    13:15:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2802:2804 -> c
+    16:18:void clearTypeElementsCache():2862:2864 -> c
+    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2510:2518 -> d
+    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2515:2515 -> d
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):132:132 -> d
-    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2521 -> d
-    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2521:2522 -> d
-    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):2582:2582 -> d
-    15:17:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2814:2816 -> d
-    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2826:2826 -> d
-    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2493:2493 -> e
-    2:2:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):2590:2590 -> e
-    3:5:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2820:2822 -> e
-    6:6:com.android.tools.r8.graph.DexDebugEvent$SetOutlineFrame createSetOutlineFrame():2847:2847 -> e
-    1:1:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2830:2830 -> f
-    1:5:java.util.List extractMarkers():2500:2504 -> g
-    1:1:boolean getSkipNameValidationForTesting():906:906 -> h
-    1:3:boolean verifyNoCachedTypeElements():2870:2872 -> i
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.Ag:
+    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2519 -> d
+    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2519:2520 -> d
+    14:14:com.android.tools.r8.graph.DexType createType(java.lang.String):2580:2580 -> d
+    15:17:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2812:2814 -> d
+    18:18:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2824:2824 -> d
+    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):2491:2491 -> e
+    2:2:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):2588:2588 -> e
+    3:5:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2818:2820 -> e
+    6:6:com.android.tools.r8.graph.DexDebugEvent$SetOutlineFrame createSetOutlineFrame():2845:2845 -> e
+    1:1:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2828:2828 -> f
+    1:5:java.util.List extractMarkers():2498:2502 -> g
+    1:1:boolean getSkipNameValidationForTesting():904:904 -> h
+    1:3:boolean verifyNoCachedTypeElements():2868:2870 -> i
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.vg:
     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
@@ -28454,49 +28289,49 @@
     com.android.tools.r8.graph.DexField BOOTLOADER -> a
     com.android.tools.r8.graph.DexField CPU_ABI2 -> d
     com.android.tools.r8.graph.DexField CPU_ABI -> c
-    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):918:940 -> <init>
-    1:17:void forEachFinalField(java.util.function.Consumer):944:960 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.Bg:
+    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):916:938 -> <init>
+    1:17:void forEachFinalField(java.util.function.Consumer):942:958 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.wg:
     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
     com.android.tools.r8.graph.DexField SDK_INT -> d
     com.android.tools.r8.graph.DexField SDK -> c
-    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):964:971 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):975:979 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.Cg:
+    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):962:969 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):973:977 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.xg:
     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):983:987 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):991:992 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.Dg:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):981:985 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):989:990 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.yg:
     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):996:999 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1003:1004 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.Eg:
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):994:997 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1001:1002 -> a
+com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.zg:
     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):1031:1035 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.Fg:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1029:1033 -> <init>
+com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.Ag:
     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
     com.android.tools.r8.graph.DexField PRESSED_ENABLED_STATE_SET -> d
     com.android.tools.r8.graph.DexField ENABLED_STATE_SET -> c
-    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1008:1019 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):1023:1027 -> a
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1006:1017 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):1021:1025 -> a
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.t0:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1328:1328 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1332:1337 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1326:1326 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1330:1335 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.u0:
     java.util.Set updaters -> b
     com.android.tools.r8.graph.DexMethod referenceUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1824:1824 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1830:1849 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1853:1853 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1822:1822 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1828:1847 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1851:1851 -> a
 com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.v0$a:
     com.android.tools.r8.graph.DexField TRUE -> b
     com.android.tools.r8.graph.DexMethod toString -> g
@@ -28505,25 +28340,25 @@
     com.android.tools.r8.graph.DexMethod parseBoolean -> e
     com.android.tools.r8.graph.DexField TYPE -> c
     com.android.tools.r8.graph.DexMethod booleanValue -> d
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1038:1038 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1053:1053 -> <init>
-    3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1040:1051 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):1057:1059 -> a
-com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.Gg:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1036:1036 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1051:1051 -> <init>
+    3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1038:1049 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):1055:1057 -> a
+com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.Bg:
     java.util.List bufferCovariantMethods -> a
-    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1486:1497 -> <init>
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1484:1495 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.w0:
     com.android.tools.r8.graph.DexMethod valueOf -> c
     com.android.tools.r8.graph.DexMethod toString -> b
     com.android.tools.r8.graph.DexMethod byteValue -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1063:1063 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1072:1072 -> <init>
-    3:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1065:1070 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1061:1061 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1070:1070 -> <init>
+    3:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1063:1068 -> <init>
 com.android.tools.r8.graph.DexItemFactory$CharMembers -> com.android.tools.r8.graph.x0:
     com.android.tools.r8.graph.DexMethod toString -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1075:1075 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1080:1080 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1077:1078 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1073:1073 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1078:1078 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1075:1076 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.y0:
     com.android.tools.r8.graph.DexMethod newInstance -> l
     com.android.tools.r8.graph.DexMethod getPackage -> k
@@ -28539,21 +28374,21 @@
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
     java.util.Set getMembers -> m
     java.util.Set getNames -> n
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1560:1560 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1583:1583 -> <init>
-    3:62:void <init>(com.android.tools.r8.graph.DexItemFactory):1565:1624 -> <init>
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1632:1632 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1558:1558 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1581:1581 -> <init>
+    3:62:void <init>(com.android.tools.r8.graph.DexItemFactory):1563:1622 -> <init>
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1630:1630 -> a
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.z0:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1640:1640 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1644:1646 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1638:1638 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1642:1644 -> <init>
 com.android.tools.r8.graph.DexItemFactory$DoubleMembers -> com.android.tools.r8.graph.A0:
     com.android.tools.r8.graph.DexMethod toString -> b
     com.android.tools.r8.graph.DexMethod isNaN -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1260:1260 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1267:1267 -> <init>
-    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1264:1271 -> <init>
-    11:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1269:1269 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1258:1258 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1265:1265 -> <init>
+    3:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1262:1269 -> <init>
+    11:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1267:1267 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.graph.B0:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexMethod finalize -> l
@@ -28569,82 +28404,82 @@
     com.android.tools.r8.graph.DexField ordinalField -> b
     com.android.tools.r8.graph.DexField nameField -> a
     com.android.tools.r8.graph.DexItemFactory this$0 -> m
-    1:1:void <clinit>():1687:1687 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1687:1687 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1707:1707 -> <init>
-    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1689:1734 -> <init>
-    1:2:void forEachField(java.util.function.Consumer):1738:1739 -> a
-    3:4:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1747:1748 -> a
+    1:1:void <clinit>():1685:1685 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1685:1685 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1705:1705 -> <init>
+    3:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1687:1732 -> <init>
+    1:2:void forEachField(java.util.function.Consumer):1736:1737 -> a
+    3:4:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1745:1746 -> a
     5:5:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():204:204 -> a
-    5:5:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1748 -> a
+    5:5:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1746 -> a
     6:6:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
-    6:6:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1748 -> a
-    1:3:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1752:1754 -> b
+    6:6:boolean isEnumField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1746 -> a
+    1:3:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1750:1752 -> b
     4:4:boolean com.android.tools.r8.graph.DexEncodedField.isSynthetic():234:234 -> b
-    4:4:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1755 -> b
+    4:4:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1753 -> b
     5:5:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> b
-    5:5:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1756 -> b
+    5:5:boolean isValuesFieldCandidate(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexType):1754 -> b
 com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.C0:
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1083:1083 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1090:1090 -> <init>
-    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1085:1088 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1094:1094 -> a
-com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.Hg:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1081:1081 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1088:1088 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1083:1086 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1092:1092 -> a
+com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.Cg:
     com.android.tools.r8.graph.DexMethod initWithMessage -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1768:1772 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1771:1771 -> <init>
-com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.Ig:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1766:1770 -> <init>
+    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1769:1769 -> <init>
+com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.Dg:
     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):1277:1282 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1286:1286 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.Jg:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1275:1280 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1284:1284 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.Eg:
     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):1098:1101 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1105:1106 -> a
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1096:1099 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1103:1104 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaLangAnnotationRetentionPolicyMembers -> com.android.tools.r8.graph.D0:
     com.android.tools.r8.graph.DexField CLASS -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1654:1654 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1660:1660 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1656:1657 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1652:1652 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1658:1658 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1654:1655 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers -> com.android.tools.r8.graph.E0:
     com.android.tools.r8.graph.DexMethod newInstanceMethodWithDimensions -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1663:1663 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1671:1671 -> <init>
-    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1665:1668 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1666:1666 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1661:1661 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1669:1669 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1663:1666 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1664:1664 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.tools.r8.graph.F0:
     com.android.tools.r8.graph.DexMethod identityHashCode -> b
     com.android.tools.r8.graph.DexMethod arraycopy -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1674:1674 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1684:1684 -> <init>
-    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1676:1679 -> <init>
-    7:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1677:1682 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.Kg:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1672:1672 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1682:1682 -> <init>
+    3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1674:1677 -> <init>
+    7:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1675:1680 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.Fg:
     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):1110:1114 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1118:1119 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.Lg:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1108:1112 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1116:1117 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.Gg:
     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):1123:1128 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1132:1133 -> a
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1121:1126 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1130:1131 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.G0:
     com.android.tools.r8.graph.DexMethod equalsObjectArray -> b
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1137:1137 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1142:1146 -> <init>
-    7:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1144:1150 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.Mg:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1135:1135 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1140:1144 -> <init>
+    7:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1142:1148 -> <init>
+com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.Hg:
     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):1158:1163 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):1167:1168 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.Ng:
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1156:1161 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):1165:1166 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.Ig:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
     com.android.tools.r8.graph.DexField SECONDS -> g
@@ -28652,38 +28487,38 @@
     com.android.tools.r8.graph.DexField DAYS -> a
     com.android.tools.r8.graph.DexField MILLISECONDS -> d
     com.android.tools.r8.graph.DexField MICROSECONDS -> c
-    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1172:1187 -> <init>
-    1:7:void forEachFinalField(java.util.function.Consumer):1191:1197 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.Og:
+    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1170:1185 -> <init>
+    1:7:void forEachFinalField(java.util.function.Consumer):1189:1195 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.Jg:
     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):1201:1205 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):1209:1211 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.Pg:
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1199:1203 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):1207:1209 -> a
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.Kg:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
     com.android.tools.r8.graph.DexField FINE -> b
     com.android.tools.r8.graph.DexField CONFIG -> a
     com.android.tools.r8.graph.DexField FINEST -> d
     com.android.tools.r8.graph.DexField FINER -> c
-    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1215:1228 -> <init>
-    1:6:void forEachFinalField(java.util.function.Consumer):1232:1237 -> a
-com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.Qg:
-    1:1:void <init>():913:913 -> <init>
+    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1213:1226 -> <init>
+    1:6:void forEachFinalField(java.util.function.Consumer):1230:1235 -> a
+com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.Lg:
+    1:1:void <init>():911:911 -> <init>
     void forEachFinalField(java.util.function.Consumer) -> a
 com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.H0:
     com.android.tools.r8.graph.DexField TYPE -> a
     com.android.tools.r8.graph.DexMethod toString -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1241:1241 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1249:1249 -> <init>
-    3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1243:1251 -> <init>
-    12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1250:1250 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1256:1256 -> a
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.Rg:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1239:1239 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1247:1247 -> <init>
+    3:11:void <init>(com.android.tools.r8.graph.DexItemFactory):1241:1249 -> <init>
+    12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1248:1248 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1254:1254 -> a
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.Mg:
     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):1760:1765 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1758:1763 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.v0$b:
     com.android.tools.r8.graph.DexMethod waitLongInt -> n
     com.android.tools.r8.graph.DexMethod waitLong -> m
@@ -28699,15 +28534,15 @@
     com.android.tools.r8.graph.DexMethod clone -> c
     com.android.tools.r8.graph.DexField clinitField -> b
     com.android.tools.r8.graph.DexField classIdField -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1365:1365 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1394:1394 -> <init>
-    3:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1371:1415 -> <init>
-    1:12:boolean isObjectMember(com.android.tools.r8.graph.DexMethod):1423:1434 -> a
-com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.Sg:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1363:1363 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1392:1392 -> <init>
+    3:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1369:1413 -> <init>
+    1:12:boolean isObjectMember(com.android.tools.r8.graph.DexMethod):1421:1432 -> a
+com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.Ng:
     com.android.tools.r8.graph.DexMethod bootstrap -> a
-    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1350:1361 -> <init>
-    13:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1354:1354 -> <init>
-    14:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1352:1352 -> <init>
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1348:1359 -> <init>
+    13:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1352:1352 -> <init>
+    14:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1350:1350 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.I0:
     com.android.tools.r8.graph.DexMethod toStringWithObjectAndNullDefault -> k
     com.android.tools.r8.graph.DexMethod toStringWithObject -> j
@@ -28720,14 +28555,14 @@
     com.android.tools.r8.graph.DexMethod isNull -> c
     com.android.tools.r8.graph.DexMethod hashCode -> b
     com.android.tools.r8.graph.DexMethod equals -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1500:1500 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1526:1526 -> <init>
-    3:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1502:1515 -> <init>
-    17:22:void <init>(com.android.tools.r8.graph.DexItemFactory):1514:1519 -> <init>
-    23:39:void <init>(com.android.tools.r8.graph.DexItemFactory):1517:1533 -> <init>
-    40:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1531:1538 -> <init>
-    48:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1536:1536 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.Tg:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1498:1498 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1524:1524 -> <init>
+    3:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1500:1513 -> <init>
+    17:22:void <init>(com.android.tools.r8.graph.DexItemFactory):1512:1517 -> <init>
+    23:39:void <init>(com.android.tools.r8.graph.DexItemFactory):1515:1531 -> <init>
+    40:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1529:1536 -> <init>
+    48:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1534:1534 -> <init>
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.Og:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -28736,41 +28571,41 @@
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():2087:2087 -> <clinit>
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):2087:2122 -> <init>
-    1:14:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):2131:2144 -> a
-    15:20:java.util.Set createStrings(java.lang.String[]):2149:2154 -> a
-    1:7:boolean isPolymorphicInvoke(com.android.tools.r8.graph.DexMethod):2158:2164 -> b
+    1:1:void <clinit>():2085:2085 -> <clinit>
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):2085:2120 -> <init>
+    1:14:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):2129:2142 -> a
+    15:20:java.util.Set createStrings(java.lang.String[]):2147:2152 -> a
+    1:7:boolean isPolymorphicInvoke(com.android.tools.r8.graph.DexMethod):2156:2162 -> b
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.J0:
     java.util.Map boxedFieldTypeToPrimitiveType -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1781:1781 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1793:1812 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1816:1816 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1779:1779 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1791:1810 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1814:1814 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.K0:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2170:2170 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):2174:2179 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2176:2176 -> <init>
-com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.Ug:
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2168:2168 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):2172:2177 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2174:2174 -> <init>
+com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.Pg:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod hashCode -> c
     com.android.tools.r8.graph.DexMethod equals -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1342:1347 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1340:1345 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.L0:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2183:2183 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2190:2196 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):2194:2202 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):2199:2204 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2181:2181 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2188:2194 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):2192:2200 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):2197:2202 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ShortMembers -> com.android.tools.r8.graph.M0:
     com.android.tools.r8.graph.DexMethod toString -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1857:1857 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1862:1862 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1859:1860 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1855:1855 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1860:1860 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1857:1858 -> <init>
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.N0:
     com.android.tools.r8.graph.DexMethod toString -> m
     com.android.tools.r8.graph.DexMethod stringConstructor -> l
@@ -28790,25 +28625,25 @@
     java.util.Set constructorMethods -> p
     java.util.Set appendMethods -> n
     com.android.tools.r8.graph.DexItemFactory this$0 -> q
-    1:1:void <clinit>():1951:1951 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1951:1951 -> <init>
-    2:48:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1975:2021 -> <init>
-    1:1:java.util.Set access$2500(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1951:1951 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):2028:2028 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2049:2075 -> a
+    1:1:void <clinit>():1949:1949 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1949:1949 -> <init>
+    2:48:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1973:2019 -> <init>
+    1:1:java.util.Set access$2500(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1949:1949 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):2026:2026 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2047:2073 -> a
     30:30:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2106,"2":2107,"3":2108}}
-    2106:2106:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2075:2075 -> a
-    2107:2107:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2075:2075 -> a
-    2108:2108:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2075:2075 -> a
-    2105:2105:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2075:2075 -> a
-    1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):2036:2036 -> b
-com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.Vg:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2104,"2":2105,"3":2106}}
+    2104:2104:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2073:2073 -> a
+    2105:2105:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2073:2073 -> a
+    2106:2106:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2073:2073 -> a
+    2103:2103:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2073:2073 -> a
+    1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):2034:2034 -> b
+com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.Qg:
     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):1290:1296 -> <init>
-    8:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1293:1302 -> <init>
-    18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1298:1298 -> <init>
+    1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1288:1294 -> <init>
+    8:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1291:1300 -> <init>
+    18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1296:1296 -> <init>
 com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.v0$c:
     com.android.tools.r8.graph.DexMethod lastIndexOfString -> o
     com.android.tools.r8.graph.DexMethod lastIndexOfInt -> n
@@ -28832,24 +28667,24 @@
     com.android.tools.r8.graph.DexMethod hashCode -> r
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> q
     com.android.tools.r8.graph.DexMethod compareTo -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1865:1865 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1897:1897 -> <init>
-    3:77:void <init>(com.android.tools.r8.graph.DexItemFactory):1867:1941 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1947:1947 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1863:1863 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1895:1895 -> <init>
+    3:77:void <init>(com.android.tools.r8.graph.DexItemFactory):1865:1939 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1945:1945 -> a
 com.android.tools.r8.graph.DexItemFactory$SupplierMembers -> com.android.tools.r8.graph.O0:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2080:2080 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):2084:2084 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexItemFactory):2082:2082 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2078:2078 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):2082:2082 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexItemFactory):2080:2080 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.v0$d:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1305:1305 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1312:1314 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1313:1316 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1315:1322 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1320:1320 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1303:1303 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1310:1312 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1311:1314 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1313:1320 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1318:1318 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.P0:
     int $r8$clinit -> u
     boolean $assertionsDisabled -> t
@@ -28863,11 +28698,11 @@
     1:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):89:90 -> f
     1:1:java.lang.String toSourceString():109:109 -> l0
     2:2:java.lang.String toSourceString():0:0 -> l0
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":111,"2":112,"3":113,"4":114}}
-    111:111:java.lang.String toSourceString():109:109 -> l0
-    112:112:java.lang.String toSourceString():109:109 -> l0
-    113:113:java.lang.String toSourceString():109:109 -> l0
-    114:114:java.lang.String toSourceString():109:109 -> l0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5,"4":6}}
+    3:3:java.lang.String toSourceString():109:109 -> l0
+    4:4:java.lang.String toSourceString():109:109 -> l0
+    5:5:java.lang.String toSourceString():109:109 -> l0
+    6:6:java.lang.String toSourceString():109:109 -> l0
     boolean isNotProgramClass() -> p1
     1:1:java.lang.String toString():104:104 -> toString
 com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.Q0:
@@ -28892,11 +28727,11 @@
     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.Wg:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.internal.Rg:
     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.Xg:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.internal.Sg:
     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.Yg:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.internal.Tg:
     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.S0:
     com.android.tools.r8.graph.DexProto proto -> i
@@ -28951,15 +28786,7 @@
     30:30:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):198:198 -> a
     31:31:boolean match(com.android.tools.r8.graph.DexEncodedMethod):247:247 -> a
     32:46:java.lang.String toSourceString(boolean,boolean):273:287 -> a
-    47:48:boolean mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):300:301 -> a
-    49:49:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    49:49:boolean mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):301 -> a
-    50:53:boolean mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):302:305 -> a
-    54:54:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    54:54:boolean mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):306 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:55:boolean mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):307:307 -> a
-    56:56:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):327:327 -> a
+    47:47:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):314:314 -> a
     1:2:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):184:185 -> b
     3:3:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> b
     3:3:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):185 -> b
@@ -28977,7 +28804,7 @@
     195:195:boolean match(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):242:242 -> b
     195:195:boolean match(com.android.tools.r8.graph.DexMethod):234 -> b
     196:196:boolean isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):296:296 -> b
-    197:197:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2856:2856 -> b
+    197:197:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2854:2854 -> b
     197:197:boolean isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):296 -> b
     198:198:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):595:595 -> b
     198:198:com.android.tools.r8.graph.DexClassAndMethod lookupMemberOnClass(com.android.tools.r8.graph.DexClass):138 -> b
@@ -29071,7 +28898,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:65:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):115:115 -> a
     65:65:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):226 -> a
-    66:66:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2746:2746 -> a
+    66:66:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2744:2744 -> a
     66:66:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.JarApplicationReader.getMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     66:66:com.android.tools.r8.graph.DexMethodHandle fromAsmHandle(com.android.tools.r8.org.objectweb.asm.Handle,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):226 -> a
@@ -29310,190 +29137,190 @@
     8:8:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):399 -> a
     9:10:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):21:22 -> a
     9:10:void lambda$collectIndexedItems$24(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):399 -> a
-    11:11:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):153:153 -> a
-    12:26:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):181:195 -> a
-    27:27:boolean lambda$forEachProgramInstanceInitializerMatching$19(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):272:272 -> a
-    28:28:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$21(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):341:341 -> a
-    29:29:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$22(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):346:346 -> a
-    30:31:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):356:357 -> a
-    32:34:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$23(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):359:361 -> a
-    35:36:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):378:379 -> a
-    37:37:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
-    37:37:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
-    38:38:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1218,"2":1219,"3":1220}}
-    1218:1218:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1218:1218:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
-    1219:1219:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1219:1219:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
-    1220:1220:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1220:1220:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
-    1220:1220:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
-    418:418:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):380:380 -> a
-    419:419:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
-    419:419:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
-    420:420:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1221,"2":1222,"3":1223}}
-    1221:1221:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1221:1221:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
-    1222:1222:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1222:1222:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
-    1223:1223:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1223:1223:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
-    1223:1223:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
-    803:805:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):383:385 -> a
-    806:806:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    806:806:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):386 -> a
-    807:807:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388:388 -> a
-    808:808:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
-    808:808:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
+    11:11:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):61:61 -> a
+    11:11:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    809:809:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
-    809:809:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
-    810:810:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    810:810:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
+    12:14:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):61:63 -> a
+    12:14:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    15:15:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
+    15:15:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    810:810:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
-    811:811:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    811:811:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
-    811:811:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
-    812:812:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):389:389 -> a
-    813:814:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):113:114 -> a
-    813:814:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    815:815:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
-    815:815:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    815:815:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    816:816:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1224,"2":1225,"3":1226}}
-    1224:1224:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1224:1224:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1224:1224:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    1225:1225:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
-    1225:1225:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1225:1225:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    1226:1226:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1226:1226:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
-    1226:1226:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1226:1226:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
-    1208:1215:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):392:399 -> a
-    1216:1216:void forEachProgramField(java.util.function.Consumer):199:199 -> a
-    1216:1216:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):399 -> a
-    1217:1217:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):400:400 -> a
-    1227:1231:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):406:410 -> a
-    1232:1232:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):422:422 -> a
-    1233:1233:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):782:782 -> a
-    1233:1233:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):422 -> a
-    1234:1234:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):473:473 -> a
-    1235:1237:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):487:489 -> a
-    1238:1242:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):502:506 -> a
-    1243:1250:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):516:523 -> a
-    1243:1250:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1251:1251:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):578:578 -> a
-    1251:1251:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
-    1251:1251:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1252:1254:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> a
-    1252:1254:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):579 -> a
-    1252:1254:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
-    1252:1254:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1255:1256:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):583:584 -> a
-    1255:1256:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
-    1255:1256:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1257:1259:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> a
-    1257:1259:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):584 -> a
-    1257:1259:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
-    1257:1259:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
-    1260:1260:int lambda$computeStaticValuesArray$27(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):637:637 -> a
-    1261:1263:boolean hasNonDefaultStaticFieldValues():655:657 -> a
-    1261:1263:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):632 -> a
-    1264:1264:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
-    1264:1264:boolean hasNonDefaultStaticFieldValues():657 -> a
-    1264:1264:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):632 -> a
-    1265:1275:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):635:645 -> a
-    1276:1276:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
-    1276:1276:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):645 -> a
-    1277:1277:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):650:650 -> a
-    1278:1279:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):738:739 -> a
-    1280:1280:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):779:779 -> a
-    1281:1281:java.util.Iterator lambda$asProgramClasses$28(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):780:780 -> a
-    1282:1282:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812:812 -> a
-    1283:1283:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1283:1283:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812 -> a
-    1284:1284:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812:812 -> a
-    1:1:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):61:61 -> b
-    1:1:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:4:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):61:63 -> b
-    2:4:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    5:5:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):178:178 -> b
-    5:5:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    6:6:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> b
-    6:6:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> b
-    6:6:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63 -> b
-    6:6:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    7:7:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> b
-    7:7:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> b
-    7:7:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> b
-    7:7:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63 -> b
-    7:7:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    8:12:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):64:68 -> b
-    8:12:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    13:13:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> b
-    13:13:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68 -> b
-    13:13:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
+    15:15:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    16:16:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
+    16:16:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    16:16:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63 -> a
+    16:16:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    17:17:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    17:17:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):193 -> a
+    17:17:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):179 -> a
+    17:17:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):63 -> a
+    17:17:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    18:22:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):64:68 -> a
+    18:22:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    23:23:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
+    23:23:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68 -> a
+    23:23:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    14:14:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> b
-    14:14:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68 -> b
-    14:14:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    15:15:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> b
-    15:15:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> b
+    24:24:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
+    24:24:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68 -> a
+    24:24:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    25:25:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
+    25:25:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68 -> b
-    15:15:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    16:16:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> b
-    16:16:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> b
-    16:16:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68 -> b
-    16:16:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    17:17:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69:69 -> b
-    17:17:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> b
-    18:18:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexProgramClass):181:181 -> b
-    19:19:void lambda$forEachProgramFieldMatching$10(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):204:204 -> b
-    20:20:void lambda$forEachProgramDirectMethodMatching$18(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):262:262 -> b
-    21:21:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):294:294 -> b
-    22:22:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):325:325 -> b
-    22:22:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):294 -> b
-    23:23:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):341:341 -> b
-    24:26:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):416:418 -> b
-    27:27:boolean hasMethodsOrFields():601:601 -> b
-    27:27:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):420 -> b
-    28:29:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):421:422 -> b
-    30:30:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):98:98 -> b
-    30:30:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):422 -> b
-    31:31:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):98:98 -> b
-    31:31:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):422 -> b
+    25:25:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68 -> a
+    25:25:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    26:26:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
+    26:26:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
+    26:26:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68 -> a
+    26:26:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    27:27:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69:69 -> a
+    27:27:void lambda$collectIndexedItems$25(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):400 -> a
+    28:28:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):153:153 -> a
+    29:43:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):181:195 -> a
+    44:44:boolean lambda$forEachProgramInstanceInitializerMatching$19(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):272:272 -> a
+    45:45:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$21(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):341:341 -> a
+    46:46:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$22(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):346:346 -> a
+    47:48:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):356:357 -> a
+    49:51:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$23(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):359:361 -> a
+    52:53:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):378:379 -> a
+    54:54:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
+    54:54:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
+    55:55:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1235,"2":1236,"3":1237}}
+    1235:1235:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1235:1235:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
+    1236:1236:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1236:1236:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
+    1237:1237:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    1237:1237:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    1237:1237:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):379 -> a
+    435:435:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):380:380 -> a
+    436:436:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
+    436:436:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
+    437:437:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1238,"2":1239,"3":1240}}
+    1238:1238:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1238:1238:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
+    1239:1239:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1239:1239:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
+    1240:1240:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    1240:1240:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    1240:1240:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):381 -> a
+    820:822:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):383:385 -> a
+    823:823:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    823:823:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):386 -> a
+    824:824:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388:388 -> a
+    825:825:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
+    825:825:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:35:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):423:426 -> b
-    36:37:void com.android.tools.r8.graph.DexAnnotationSet.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):127:128 -> b
-    36:37:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):426 -> b
-    38:38:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):427:427 -> b
-    39:39:void com.android.tools.r8.graph.DexTypeList.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):120:120 -> b
-    39:39:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):428 -> b
-    40:58:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):547:565 -> b
-    59:59:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):578:578 -> b
-    59:59:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):569 -> b
-    60:62:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> b
-    60:62:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):579 -> b
-    60:62:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):569 -> b
-    63:64:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):583:584 -> b
-    63:64:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):569 -> b
-    65:67:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> b
-    65:67:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):584 -> b
-    65:67:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):569 -> b
-    68:68:boolean com.android.tools.r8.graph.DexClass.isFinal():672:672 -> b
-    68:68:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):448 -> b
-    69:75:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):451:457 -> b
-    76:78:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):732:734 -> b
+    826:826:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120:120 -> a
+    826:826:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
+    827:827:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
+    827:827:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    827:827:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
+    828:828:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
+    828:828:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):121 -> a
+    828:828:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):388 -> a
+    829:829:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):389:389 -> a
+    830:831:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):113:114 -> a
+    830:831:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    832:832:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):245:245 -> a
+    832:832:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    832:832:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    833:833:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1241,"2":1242,"3":1243}}
+    1241:1241:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1241:1241:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1241:1241:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    1242:1242:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246:246 -> a
+    1242:1242:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1242:1242:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    1243:1243:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    1243:1243:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):246 -> a
+    1243:1243:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1243:1243:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):390 -> a
+    1225:1232:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):392:399 -> a
+    1233:1233:void forEachProgramField(java.util.function.Consumer):199:199 -> a
+    1233:1233:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):399 -> a
+    1234:1234:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):400:400 -> a
+    1244:1248:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):406:410 -> a
+    1249:1249:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):422:422 -> a
+    1250:1250:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):782:782 -> a
+    1250:1250:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):422 -> a
+    1251:1251:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):473:473 -> a
+    1252:1254:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):487:489 -> a
+    1255:1259:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):502:506 -> a
+    1260:1267:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):516:523 -> a
+    1260:1267:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1268:1268:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):578:578 -> a
+    1268:1268:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
+    1268:1268:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1269:1271:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> a
+    1269:1271:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):579 -> a
+    1269:1271:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
+    1269:1271:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1272:1273:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):583:584 -> a
+    1272:1273:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
+    1272:1273:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1274:1276:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> a
+    1274:1276:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):584 -> a
+    1274:1276:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):524 -> a
+    1274:1276:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):508 -> a
+    1277:1277:int lambda$computeStaticValuesArray$27(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):637:637 -> a
+    1278:1280:boolean hasNonDefaultStaticFieldValues():655:657 -> a
+    1278:1280:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):632 -> a
+    1281:1281:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
+    1281:1281:boolean hasNonDefaultStaticFieldValues():657 -> a
+    1281:1281:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):632 -> a
+    1282:1292:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):635:645 -> a
+    1293:1293:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
+    1293:1293:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):645 -> a
+    1294:1294:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):650:650 -> a
+    1295:1296:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):738:739 -> a
+    1297:1297:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):779:779 -> a
+    1298:1298:java.util.Iterator lambda$asProgramClasses$28(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):780:780 -> a
+    1299:1299:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812:812 -> a
+    1300:1300:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1300:1300:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812 -> a
+    1301:1301:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):812:812 -> a
+    1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexProgramClass):181:181 -> b
+    2:2:void lambda$forEachProgramFieldMatching$10(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):204:204 -> b
+    3:3:void lambda$forEachProgramDirectMethodMatching$18(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):262:262 -> b
+    4:4:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):294:294 -> b
+    5:5:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):325:325 -> b
+    5:5:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):294 -> b
+    6:6:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):341:341 -> b
+    7:9:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):416:418 -> b
+    10:10:boolean hasMethodsOrFields():601:601 -> b
+    10:10:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):420 -> b
+    11:12:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):421:422 -> b
+    13:13:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):98:98 -> b
+    13:13:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):422 -> b
+    14:14:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):98:98 -> b
+    14:14:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):422 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    15:18:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):423:426 -> b
+    19:20:void com.android.tools.r8.graph.DexAnnotationSet.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):127:128 -> b
+    19:20:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):426 -> b
+    21:21:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):427:427 -> b
+    22:22:void com.android.tools.r8.graph.DexTypeList.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):120:120 -> b
+    22:22:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):428 -> b
+    23:41:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):547:565 -> b
+    42:42:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):578:578 -> b
+    42:42:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):569 -> b
+    43:45:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> b
+    43:45:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):579 -> b
+    43:45:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):569 -> b
+    46:47:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):583:584 -> b
+    46:47:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):569 -> b
+    48:50:boolean com.android.tools.r8.graph.DexType.internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):146:148 -> b
+    48:50:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):584 -> b
+    48:50:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):569 -> b
+    51:51:boolean com.android.tools.r8.graph.DexClass.isFinal():672:672 -> b
+    51:51:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):448 -> b
+    52:58:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):451:457 -> b
+    59:61:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):732:734 -> b
     1:1:com.android.tools.r8.graph.DexType lambda$specify$1(com.android.tools.r8.graph.DexProgramClass):182:182 -> c
     2:2:void lambda$forEachProgramInstanceField$11(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):208:208 -> c
     3:3:void lambda$forEachProgramMethodMatching$13(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):227:227 -> c
@@ -29774,9 +29601,9 @@
     1:4:java.lang.String toBinaryName():179:182 -> T0
     5:5:java.lang.String toBinaryName():180:180 -> T0
     6:6:java.lang.String toBinaryName():0:0 -> T0
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":189,"3":190}}
-    189:189:java.lang.String toBinaryName():183:183 -> T0
-    190:190:java.lang.String toBinaryName():183:183 -> T0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7,"3":9}}
+    7:7:java.lang.String toBinaryName():183:183 -> T0
+    9:9:java.lang.String toBinaryName():183:183 -> T0
     1:1:java.lang.String toDescriptorString():175:175 -> U0
     1:1:char toShorty():229:229 -> V0
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):30:30 -> a
@@ -29894,7 +29721,7 @@
     1:1:int size():137:137 -> size
     1:1:java.util.stream.Stream stream():141:141 -> stream
     1:8:java.lang.String toString():146:153 -> toString
-com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.fh:
+com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.ah:
     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
@@ -30548,7 +30375,7 @@
     int[] $SwitchMap$com$android$tools$r8$graph$DexWritableCode$DexWritableCodeKind -> b
     boolean $assertionsDisabled -> a
     1:9:void <clinit>():37:45 -> <clinit>
-com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind -> com.android.tools.r8.internal.jh:
+com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind -> com.android.tools.r8.internal.eh:
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind THROW_EXCEPTION -> e
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind THROW_NULL -> d
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind[] $VALUES -> f
@@ -30565,108 +30392,104 @@
     com.android.tools.r8.com.google.common.collect.ImmutableCollection classpathClasses -> m
     com.android.tools.r8.com.google.common.collect.ImmutableMap libraryClasses -> k
     com.android.tools.r8.com.google.common.collect.ImmutableCollection programClasses -> l
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DirectMappedDexApplication$1):28:28 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):53:53 -> <init>
-    3:28:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):32:57 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection access$100(com.android.tools.r8.graph.DirectMappedDexApplication):28:28 -> a
-    2:2:void lambda$forEachProgramType$0(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):71:71 -> a
-    3:3:void forEachLibraryType(java.util.function.Consumer):76:76 -> a
-    4:4:void lambda$forEachLibraryType$1(java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):76:76 -> a
-    5:5:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):153:153 -> a
-    6:6:java.util.Collection programClasses():66:66 -> a
-    6:6:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):153 -> a
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DirectMappedDexApplication$1):27:27 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):52:52 -> <init>
+    3:28:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):31:56 -> <init>
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection access$100(com.android.tools.r8.graph.DirectMappedDexApplication):27:27 -> a
+    2:2:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):142:142 -> a
+    3:3:java.util.Collection programClasses():65:65 -> a
+    3:3:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):142 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:8:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):163:164 -> a
-    7:8:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):153 -> a
-    9:9:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19,"2":20,"3":21}}
-    19:19:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):165:165 -> a
-    19:19:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):153 -> a
-    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    20:20:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):165 -> a
-    20:20:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):153 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    21:21:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):165 -> a
-    21:21:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):153 -> a
-    10:17:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):166:173 -> a
-    10:17:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):153 -> a
-    18:18:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):154:154 -> a
+    4:5:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):152:153 -> a
+    4:5:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):142 -> a
+    6:6:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16,"2":17,"3":18}}
+    16:16:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):154:154 -> a
+    16:16:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):142 -> a
+    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    17:17:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):154 -> a
+    17:17:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):142 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    18:18:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):154 -> a
+    18:18:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):142 -> a
+    7:14:boolean mappingIsValid(java.util.Collection,com.android.tools.r8.graph.GraphLens):155:162 -> a
+    7:14:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):142 -> a
+    15:15:boolean verifyWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):143:143 -> a
     com.android.tools.r8.graph.DirectMappedDexApplication asDirect() -> b
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$200(com.android.tools.r8.graph.DirectMappedDexApplication):28:28 -> b
-    2:2:void forEachProgramType(java.util.function.Consumer):71:71 -> b
-    1:1:com.android.tools.r8.graph.DexApplication$Builder builder():28:28 -> c
-    2:3:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):123:124 -> c
-    1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):85:85 -> d
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$200(com.android.tools.r8.graph.DirectMappedDexApplication):27:27 -> b
+    1:1:com.android.tools.r8.graph.DexApplication$Builder builder():27:27 -> c
+    2:3:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):112:113 -> c
+    1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):74:74 -> d
     2:2:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100,"4":101,"5":102}}
-    98:98:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):85:85 -> d
-    99:99:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):85:85 -> d
-    100:100:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):85:85 -> d
-    101:101:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):85:85 -> d
-    102:102:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):85:85 -> d
-    87:95:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):85:93 -> d
-    96:96:com.android.tools.r8.graph.ClassResolutionResult$Builder com.android.tools.r8.graph.ClassResolutionResult.builder():20:20 -> d
-    96:96:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):95 -> d
-    97:97:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):95:95 -> d
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):101:101 -> e
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":87,"2":88,"3":89,"4":90,"5":91}}
+    87:87:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):74:74 -> d
+    88:88:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):74:74 -> d
+    89:89:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):74:74 -> d
+    90:90:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):74:74 -> d
+    91:91:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):74:74 -> d
+    76:84:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):74:82 -> d
+    85:85:com.android.tools.r8.graph.ClassResolutionResult$Builder com.android.tools.r8.graph.ClassResolutionResult.builder():20:20 -> d
+    85:85:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):84 -> d
+    86:86:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):84:84 -> d
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):90:90 -> e
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":120,"2":121,"3":122,"4":123,"5":124}}
-    120:120:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):101:101 -> e
-    121:121:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):101:101 -> e
-    122:122:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):101:101 -> e
-    123:123:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):101:101 -> e
-    124:124:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):101:101 -> e
-    103:119:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):101:117 -> e
-    1:1:java.util.Collection programClasses():66:66 -> h
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109,"2":110,"3":111,"4":112,"5":113}}
+    109:109:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):90:90 -> e
+    110:110:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):90:90 -> e
+    111:111:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):90:90 -> e
+    112:112:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):90:90 -> e
+    113:113:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):90:90 -> e
+    92:108:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):90:106 -> e
+    1:1:java.util.Collection programClasses():65:65 -> h
     com.android.tools.r8.graph.DirectMappedDexApplication toDirect() -> i
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder builder():129:129 -> j
-    1:1:java.util.Collection classpathClasses():61:61 -> k
-    1:1:java.util.Collection libraryClasses():80:80 -> l
-    1:4:boolean verifyCodeObjectsOwners():193:196 -> m
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder builder():118:118 -> j
+    1:1:java.util.Collection classpathClasses():60:60 -> k
+    1:1:java.util.Collection libraryClasses():69:69 -> l
+    1:4:boolean verifyCodeObjectsOwners():182:185 -> m
     5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):236:236 -> m
-    5:5:boolean verifyCodeObjectsOwners():196 -> m
+    5:5:boolean verifyCodeObjectsOwners():185 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):236:236 -> m
-    6:6:boolean verifyCodeObjectsOwners():196 -> m
-    7:17:boolean verifyCodeObjectsOwners():196:206 -> m
-    1:1:java.lang.String toString():149:149 -> toString
+    6:6:boolean verifyCodeObjectsOwners():185 -> m
+    7:17:boolean verifyCodeObjectsOwners():185:195 -> m
+    1:1:java.lang.String toString():138:138 -> toString
 com.android.tools.r8.graph.DirectMappedDexApplication$Builder -> com.android.tools.r8.graph.t1:
     boolean $assertionsDisabled -> m
     java.util.Map libraryClasses -> j
     com.android.tools.r8.com.google.common.collect.ImmutableCollection classpathClasses -> i
     java.util.Set pendingClasspathRemovalIfPresent -> l
     java.util.List pendingClasspathClasses -> k
-    1:1:void <clinit>():212:212 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):212:212 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):221:221 -> <init>
-    3:12:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):217:226 -> <init>
-    13:13:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):230:230 -> <init>
-    14:29:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):217:232 -> <init>
+    1:1:void <clinit>():201:201 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.DirectMappedDexApplication$1):201:201 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):210:210 -> <init>
+    3:12:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):206:215 -> <init>
+    13:13:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):219:219 -> <init>
+    14:29:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication):206:221 -> <init>
     com.android.tools.r8.graph.DirectMappedDexApplication$Builder asDirect() -> a
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):267:267 -> a
-    2:4:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceClasspathClasses(java.util.Collection):283:285 -> a
-    5:5:void lambda$replaceLibraryClasses$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexLibraryClass):291:291 -> a
-    6:9:boolean addAll(java.util.Map,java.lang.Iterable):333:336 -> a
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):256:256 -> a
+    2:4:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceClasspathClasses(java.util.Collection):272:274 -> a
+    5:5:void lambda$replaceLibraryClasses$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexLibraryClass):280:280 -> a
+    6:9:boolean addAll(java.util.Map,java.lang.Iterable):322:325 -> a
     10:10:boolean addAll(java.util.Map,java.lang.Iterable):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":347,"2":348,"3":349}}
-    347:347:boolean addAll(java.util.Map,java.lang.Iterable):336:336 -> a
-    348:348:boolean addAll(java.util.Map,java.lang.Iterable):336:336 -> a
-    349:349:boolean addAll(java.util.Map,java.lang.Iterable):336:336 -> a
-    346:346:boolean addAll(java.util.Map,java.lang.Iterable):336:336 -> a
-    1:1:com.android.tools.r8.graph.DexApplication build():212:212 -> b
-    2:4:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):247:249 -> b
-    5:6:void ensureMutableLibraryClassesMap():256:257 -> b
-    5:6:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):250 -> b
-    7:7:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):251:251 -> b
-    8:10:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):290:292 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":336,"2":337,"3":338}}
+    336:336:boolean addAll(java.util.Map,java.lang.Iterable):325:325 -> a
+    337:337:boolean addAll(java.util.Map,java.lang.Iterable):325:325 -> a
+    338:338:boolean addAll(java.util.Map,java.lang.Iterable):325:325 -> a
+    335:335:boolean addAll(java.util.Map,java.lang.Iterable):325:325 -> a
+    1:1:com.android.tools.r8.graph.DexApplication build():201:201 -> b
+    2:4:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):236:238 -> b
+    5:6:void ensureMutableLibraryClassesMap():245:246 -> b
+    5:6:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):239 -> b
+    7:7:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):240:240 -> b
+    8:10:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):279:281 -> b
     com.android.tools.r8.graph.DexApplication$Builder self() -> d
-    1:7:void commitPendingClasspathClasses():272:278 -> e
-    1:7:com.android.tools.r8.graph.DirectMappedDexApplication build():300 -> e
-    8:27:com.android.tools.r8.graph.DirectMappedDexApplication build():301:320 -> e
-    28:31:com.android.tools.r8.com.google.common.collect.ImmutableMap getLibraryClassesAsImmutableMap():345:348 -> e
-    28:31:com.android.tools.r8.graph.DirectMappedDexApplication build():321 -> e
-    32:34:com.android.tools.r8.graph.DirectMappedDexApplication build():322:324 -> e
+    1:7:void commitPendingClasspathClasses():261:267 -> e
+    1:7:com.android.tools.r8.graph.DirectMappedDexApplication build():289 -> e
+    8:27:com.android.tools.r8.graph.DirectMappedDexApplication build():290:309 -> e
+    28:31:com.android.tools.r8.com.google.common.collect.ImmutableMap getLibraryClassesAsImmutableMap():334:337 -> e
+    28:31:com.android.tools.r8.graph.DirectMappedDexApplication build():310 -> e
+    32:34:com.android.tools.r8.graph.DirectMappedDexApplication build():311:313 -> e
 com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.graph.v1:
     com.android.tools.r8.graph.DexType enclosingClass -> a
     com.android.tools.r8.graph.DexMethod enclosingMethod -> b
@@ -30706,16 +30529,16 @@
     1:1:boolean equals(java.lang.Object):79:79 -> equals
     1:2:int hashCode():73:74 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":195,"2":196,"3":197}}
-    195:195:java.lang.String toString():95:95 -> toString
-    196:196:java.lang.String toString():95:95 -> toString
-    197:197:java.lang.String toString():95:95 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101,"2":102,"3":103}}
+    101:101:java.lang.String toString():95:95 -> toString
+    102:102:java.lang.String toString():95:95 -> toString
+    103:103:java.lang.String toString():95:95 -> toString
     97:99:java.lang.String toString():96:98 -> toString
     100:100:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":200,"2":201,"3":202}}
-    200:200:java.lang.String toString():98:98 -> toString
-    201:201:java.lang.String toString():98:98 -> toString
-    202:202:java.lang.String toString():98:98 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101,"2":102,"3":103}}
+    101:101:java.lang.String toString():98:98 -> toString
+    102:102:java.lang.String toString():98:98 -> toString
+    103:103:java.lang.String toString():98:98 -> toString
 com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.x1:
     boolean $assertionsDisabled -> f
     int $r8$clinit -> g
@@ -30760,9 +30583,9 @@
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():373:374 -> e
     1:2: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.yj:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.zj:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.Aj:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.tj:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.uj:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.vj:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -30783,7 +30606,7 @@
     1:1:void flattenAccessContexts():35:35 -> b
     2:2:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):50:50 -> b
     1:1:boolean verifyMappingIsOneToOne():95:95 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.Bj:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.wj:
     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
@@ -30885,19 +30708,19 @@
     46:46:void lambda$resolveFieldOn$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexClass):66 -> a
     47:47:void lambda$resolveFieldOn$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexClass):70:70 -> a
     48:48:void lambda$resolveFieldOn$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexClass,java.util.Set,com.android.tools.r8.graph.DexClass):69:69 -> a
-    49:49:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):91:91 -> a
-    50:50:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    50:50:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):91 -> a
-    51:51:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):91:91 -> a
-    52:52:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    52:52:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):91 -> a
-    53:58:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):113:118 -> a
-    53:58:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):95 -> a
-    59:59:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):94:94 -> a
-    1:3:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):82:84 -> b
-    4:4:com.android.tools.r8.graph.FieldResolutionResult$Builder com.android.tools.r8.graph.FieldResolutionResult.builder():483:483 -> b
-    4:4:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):84 -> b
-    5:18:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):85:98 -> b
+    49:51:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):82:84 -> a
+    52:52:com.android.tools.r8.graph.FieldResolutionResult$Builder com.android.tools.r8.graph.FieldResolutionResult.builder():483:483 -> a
+    52:52:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):84 -> a
+    53:66:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOnDirectInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):85:98 -> a
+    67:67:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):91:91 -> a
+    68:68:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    68:68:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):91 -> a
+    69:69:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):91:91 -> a
+    70:70:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    70:70:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):91 -> a
+    71:76:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set):113:118 -> a
+    71:76:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):95 -> a
+    77:77:void lambda$resolveFieldOnDirectInterfaces$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.FieldResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexClass):94:94 -> a
 com.android.tools.r8.graph.FieldResolutionResult -> com.android.tools.r8.graph.H1:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
@@ -31044,7 +30867,7 @@
     1:1:void <clinit>():479:479 -> <clinit>
     1:1:void <init>():477:477 -> <init>
     1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():477:477 -> z
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.sk:
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.nk:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):14:15 -> <init>
     1:1:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):0:0 -> a
@@ -31698,7 +31521,7 @@
     191:191:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):428 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     192:195:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):428:431 -> a
-com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Ul:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Pl:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.clearIfInvalid() -> a
@@ -32045,6 +31868,7 @@
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation) -> a
     com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation) -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$lookupFieldResult$0(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> a
+    com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> a
     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,com.android.tools.r8.graph.GraphLens) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
     1:1:com.android.tools.r8.graph.DexMember getOriginalMemberSignature(com.android.tools.r8.graph.DexMember):313:313 -> a
@@ -32105,68 +31929,68 @@
     76:77:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):675:676 -> a
     78:79:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.GraphLens):645:646 -> a
     80:80:com.android.tools.r8.graph.DexReference lambda$rewriteReference$3(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):647:647 -> a
-    81:82:java.util.Set rewriteReferences(java.util.Set):653:654 -> a
-    83:83:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):640:640 -> a
-    83:83:java.util.Set rewriteReferences(java.util.Set):655 -> a
-    84:84:java.util.Set rewriteReferences(java.util.Set):655:655 -> a
-    85:103:java.util.Map rewriteReferenceKeys(java.util.Map,java.util.function.BiFunction):662:680 -> a
-    104:106:void lambda$rewriteReferenceKeys$7(java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):682:684 -> a
-    107:109:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):700:702 -> a
-    110:111:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):706:707 -> a
-    112:112:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    112:112:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):708 -> a
-    113:115:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):708:710 -> a
-    116:132:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):727:743 -> a
-    133:133:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269:269 -> a
-    133:133:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):743 -> a
-    134:134:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):265:265 -> a
-    134:134:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269 -> a
-    134:134:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):743 -> a
-    135:141:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):746:752 -> a
-    142:142:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1675,"2":1676,"3":1677}}
-    1675:1675:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):752:752 -> a
-    1676:1676:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):752:752 -> a
+    81:81:com.android.tools.r8.graph.DexReference lambda$rewriteReference$4(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexField):648:648 -> a
+    82:82:com.android.tools.r8.graph.DexReference lambda$rewriteReference$5(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):649:649 -> a
+    83:84:java.util.Set rewriteReferences(java.util.Set):653:654 -> a
+    85:85:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):640:640 -> a
+    85:85:java.util.Set rewriteReferences(java.util.Set):655 -> a
+    86:86:java.util.Set rewriteReferences(java.util.Set):655:655 -> a
+    87:105:java.util.Map rewriteReferenceKeys(java.util.Map,java.util.function.BiFunction):662:680 -> a
+    106:108:void lambda$rewriteReferenceKeys$7(java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):682:684 -> a
+    109:111:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):700:702 -> a
+    112:113:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):706:707 -> a
+    114:114:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    114:114:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):708 -> a
+    115:117:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):708:710 -> a
+    118:134:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):727:743 -> a
+    135:135:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269:269 -> a
+    135:135:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):743 -> a
+    136:136:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):265:265 -> a
+    136:136:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269 -> a
+    136:136:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):743 -> a
+    137:143:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):746:752 -> a
+    144:144:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1677,"2":1678,"3":1679}}
     1677:1677:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):752:752 -> a
-    896:904:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):754:762 -> a
-    905:905:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    905:905:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):762 -> a
-    906:906:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):763:763 -> a
-    907:907:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1688,"2":1689,"3":1690}}
-    1688:1688:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):763:763 -> a
-    1689:1689:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):763:763 -> a
+    1678:1678:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):752:752 -> a
+    1679:1679:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):752:752 -> a
+    898:906:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):754:762 -> a
+    907:907:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    907:907:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):762 -> a
+    908:908:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):763:763 -> a
+    909:909:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1690,"2":1691,"3":1692}}
     1690:1690:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):763:763 -> a
-    1672:1674:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):765:767 -> a
+    1691:1691:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):763:763 -> a
+    1692:1692:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):763:763 -> a
+    1674:1676:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):765:767 -> a
     com.android.tools.r8.optimize.MemberRebindingLens asMemberRebindingLens() -> b
     java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType) -> b
     com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> b
-    com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> b
+    com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> b
     1:1:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> b
     2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> b
-    3:3:com.android.tools.r8.graph.DexReference lambda$rewriteReference$4(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexField):648:648 -> b
+    3:3:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):475:475 -> b
     4:5:java.util.Map rewriteTypeKeys(java.util.Map,java.util.function.BiFunction):714:715 -> b
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens asNonIdentityLens() -> c
-    com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> c
+    com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> c
     1:1:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> c
     2:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):405:405 -> c
     3:3: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):430:430 -> c
     3:3:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):406 -> c
     4:4:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):406:406 -> c
     5:5:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):468:468 -> c
-    6:6:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):475:475 -> c
-    7:7:com.android.tools.r8.graph.DexReference lambda$rewriteReference$5(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexMethod):649:649 -> c
-    com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> d
-    1:1:com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupFieldResult(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):487:487 -> d
-    2:2:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):515:515 -> d
-    3:3:com.android.tools.r8.graph.GraphLens getIdentityLens():519:519 -> d
+    6:6:com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupFieldResult(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):487:487 -> c
+    1:1:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):515:515 -> d
+    2:2:com.android.tools.r8.graph.GraphLens getIdentityLens():519:519 -> d
     boolean hasCodeRewritings() -> e
     boolean hasCustomCodeRewritings() -> f
     boolean isContextFreeForMethods() -> g
     boolean isEnumUnboxerLens() -> h
-    boolean isIdentityLens() -> i
-    boolean isNonIdentityLens() -> j
-com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.cm:
+    boolean isHorizontalClassMergerGraphLens() -> i
+    boolean isIdentityLens() -> j
+    boolean isNonIdentityLens() -> k
+com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.Xl:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> b
     java.util.Map typeMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap fieldMap -> a
@@ -32189,8 +32013,8 @@
     1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1057:1057 -> b
     2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1075:1075 -> b
     3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1103:1103 -> b
+    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1087:1087 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1087:1087 -> d
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     1:1:boolean isContextFreeForMethods():1137:1137 -> g
 com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.h2:
@@ -32228,26 +32052,26 @@
     com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
-    1:2: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,com.android.tools.r8.graph.GraphLens):1000:1001 -> a
-    3:3:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:103 -> a
-    3:3: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,com.android.tools.r8.graph.GraphLens):1001 -> a
-    4:4: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,com.android.tools.r8.graph.GraphLens):1001:1001 -> a
-    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1016:1016 -> a
-    6:6:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:103 -> a
-    6:6:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1016 -> a
-    7:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1016:1016 -> a
-    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1015:1015 -> a
-    9:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):1028:1028 -> a
+    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):993:993 -> a
+    2:3: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,com.android.tools.r8.graph.GraphLens):1000:1001 -> a
+    4:4:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:103 -> a
+    4:4: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,com.android.tools.r8.graph.GraphLens):1001 -> a
+    5:5: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,com.android.tools.r8.graph.GraphLens):1001:1001 -> a
+    6:6:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1016:1016 -> a
+    7:7:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:103 -> a
+    7:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1016 -> a
+    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1016:1016 -> a
+    9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):1015:1015 -> a
+    10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):1028:1028 -> a
     com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> b
+    com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> b
     1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):963:963 -> b
-    2:2:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):993:993 -> b
-    com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens) -> c
-    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1007:1007 -> d
+    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1007:1007 -> c
     boolean hasCodeRewritings() -> e
     boolean isContextFreeForMethods() -> g
-    boolean isIdentityLens() -> i
-    boolean isNonIdentityLens() -> j
-    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():936:936 -> k
+    boolean isIdentityLens() -> j
+    boolean isNonIdentityLens() -> k
+    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():936:936 -> l
 com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.j2:
     com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> a
 com.android.tools.r8.graph.GraphLens$LookupMethodContinuation -> com.android.tools.r8.graph.k2:
@@ -32323,50 +32147,50 @@
     23:23:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):103:103 -> a
     23:23: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,com.android.tools.r8.graph.GraphLens):834 -> a
     24:28: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,com.android.tools.r8.graph.GraphLens):835:839 -> a
-    29:31:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):881:883 -> a
-    32:32:com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$internalLookupField$2(com.android.tools.r8.graph.GraphLens$LookupFieldContinuation,com.android.tools.r8.graph.GraphLens$FieldLookupResult):886:886 -> a
-    33:39:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):897:903 -> a
-    40:40:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):901:901 -> a
-    41:41:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$internalLookupMethod$3(com.android.tools.r8.graph.GraphLens$LookupMethodContinuation,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):906:906 -> a
+    29:29:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    30:30:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":906,"2":907,"3":908}}
+    906:906:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    907:907:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    908:908:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    31:31:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":909,"2":910,"3":911,"4":912}}
+    909:909:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    910:910:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    911:911:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    912:912:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    901:901:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> a
+    902:902:com.android.tools.r8.graph.GraphLens getPrevious():795:795 -> a
+    902:902:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):874 -> a
+    903:903:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):874:874 -> a
+    904:904:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):392:392 -> a
+    904:904:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):874 -> a
+    905:905:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):874:874 -> a
+    913:915:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):881:883 -> a
+    916:916:com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$internalLookupField$2(com.android.tools.r8.graph.GraphLens$LookupFieldContinuation,com.android.tools.r8.graph.GraphLens$FieldLookupResult):886:886 -> a
+    917:923:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):897:903 -> a
+    924:924:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):901:901 -> a
+    925:925:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$internalLookupMethod$3(com.android.tools.r8.graph.GraphLens$LookupMethodContinuation,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):906:906 -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     1:1:com.android.tools.r8.graph.GraphLens getPrevious():795:795 -> b
     1:1:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens findPrevious(java.util.function.Predicate):815 -> b
     2:2:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens findPrevious(java.util.function.Predicate):816:816 -> b
-    3:3:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    4:4:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":880,"2":881,"3":882}}
-    880:880:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    881:881:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    882:882:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    5:5:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":883,"2":884,"3":885,"4":886}}
-    883:883:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    884:884:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    885:885:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    886:886:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    875:875:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):870:870 -> b
-    876:876:com.android.tools.r8.graph.GraphLens getPrevious():795:795 -> b
-    876:876:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):874 -> b
-    877:877:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):874:874 -> b
-    878:878:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):392:392 -> b
-    878:878:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):874 -> b
-    879:879:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):874:874 -> b
+    3:9:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):852:858 -> b
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> b
+    10:10:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):859 -> b
+    11:12:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):860:861 -> b
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):392:392 -> b
+    13:13:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865 -> b
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens asNonIdentityLens() -> c
-    1:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):852:858 -> c
-    8:8:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> c
-    8:8:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):859 -> c
-    9:10:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):860:861 -> c
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupClassType(com.android.tools.r8.graph.DexType):392:392 -> c
-    11:11:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GraphLens):865 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> e
     1:1:boolean lambda$lookupMethod$0(com.android.tools.r8.graph.DexType):832 -> e
-    boolean isIdentityLens() -> i
-    boolean isNonIdentityLens() -> j
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():791:791 -> k
-    1:1:com.android.tools.r8.graph.GraphLens getPrevious():795:795 -> l
-com.android.tools.r8.graph.ImmediateProgramSubtypingInfo -> com.android.tools.r8.internal.Qn:
+    boolean isIdentityLens() -> j
+    boolean isNonIdentityLens() -> k
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():791:791 -> l
+    1:1:com.android.tools.r8.graph.GraphLens getPrevious():795:795 -> m
+com.android.tools.r8.graph.ImmediateProgramSubtypingInfo -> com.android.tools.r8.internal.Mn:
     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>
@@ -32381,30 +32205,30 @@
     22:22:void forEachImmediateProgramSuperClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):86:86 -> a
     23:23:void forEachImmediateProgramSuperClassMatching(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Consumer):93:93 -> a
     24:26:void lambda$forEachImmediateProgramSuperClassMatching$6(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):95:97 -> a
-    27:27:java.util.List getSubclasses(com.android.tools.r8.graph.DexProgramClass):116:116 -> a
+    27:28:void lambda$forEachImmediateSubClassMatching$7(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):109:110 -> a
+    29:29:java.util.List getSubclasses(com.android.tools.r8.graph.DexProgramClass):116:116 -> a
     1:3:void lambda$forEachImmediateSuperClassMatching$5(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):77:79 -> b
     4:5:void forEachImmediateSubClassMatching(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Consumer):106:107 -> b
-    1:2:void lambda$forEachImmediateSubClassMatching$7(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):109:110 -> c
 com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.r2:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():9:9 -> <clinit>
     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.mp:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.fp:
     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.lp:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.ep:
     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.Hp:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.Ap:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
@@ -32450,23 +32274,22 @@
     1:1:boolean isAnonymous():62:62 -> e
     1:1:boolean isNamed():58:58 -> f
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":253,"2":254,"3":255}}
-    253:253:java.lang.String toString():124:124 -> toString
-    254:254:java.lang.String toString():124:124 -> toString
-    255:255:java.lang.String toString():124:124 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":130,"2":131,"3":132}}
+    130:130:java.lang.String toString():124:124 -> toString
+    131:131:java.lang.String toString():124:124 -> toString
+    132:132:java.lang.String toString():124:124 -> toString
     125:128:java.lang.String toString():124:127 -> toString
     129:129:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":258,"2":259,"3":260}}
-    258:258:java.lang.String toString():127:127 -> toString
-    259:259:java.lang.String toString():127:127 -> toString
-    260:260:java.lang.String toString():127:127 -> toString
-com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.hq:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":130,"2":131,"3":132}}
+    130:130:java.lang.String toString():127:127 -> toString
+    131:131:java.lang.String toString():127:127 -> toString
+    132:132:java.lang.String toString():127:127 -> toString
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.aq:
     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.s2:
     com.android.tools.r8.graph.InvalidCode INSTANCE -> d
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():23:23 -> <init>
-    1:1:com.android.tools.r8.graph.Code getInstance():16:16 -> A0
     1:1:boolean isInvalidCode(com.android.tools.r8.graph.Code):20:20 -> a
     2:2: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):27:27 -> a
     3:3:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):32:32 -> a
@@ -32476,7 +32299,8 @@
     1:1:int computeHashCode():66:66 -> m0
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():56:56 -> q0
     1:1:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.nv:
+    1:1:com.android.tools.r8.graph.Code getInstance():16:16 -> z0
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.gv:
     com.android.tools.r8.graph.ApplicationReaderMap applicationReaderMap -> e
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
@@ -33045,7 +32869,7 @@
     1:3:void visitEnd():888:890 -> c
     4:5:boolean classRequiresCode():880:881 -> c
     4:5:void visitEnd():890 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1854:1854 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1842:1842 -> c
     6:6:boolean classRequiresCode():881 -> c
     6:6:void visitEnd():890 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
@@ -33085,7 +32909,7 @@
     72:82:void visitEnd():931:941 -> c
     83:83:void visitEnd():938:938 -> c
     84:92:void visitEnd():936:944 -> c
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.internal.ov:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.internal.hv:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
@@ -33100,11 +32924,7 @@
     1:1:void <clinit>():94:94 -> <clinit>
     1:12:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):103:114 -> <init>
     13:16:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.JarClassFileReader$ReparseContext,com.android.tools.r8.graph.JarApplicationReader):104:107 -> <init>
-    1:20:void internalParseCode():151:170 -> A0
-    21:27:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1090:1096 -> A0
-    21:27:void internalParseCode():170 -> A0
-    28:28:void internalParseCode():167:167 -> A0
-    1:2:void markReachabilitySensitive():117:118 -> B0
+    1:2:void markReachabilitySensitive():117:118 -> A0
     1:2:com.android.tools.r8.graph.CfCode asCfCode():138:139 -> W
     3:3:void com.android.tools.r8.utils.ExceptionUtils.withOriginAttachmentHandler(com.android.tools.r8.origin.Origin,java.lang.Runnable):225:225 -> W
     3:3:com.android.tools.r8.graph.CfCode asCfCode():139 -> W
@@ -33150,7 +32970,11 @@
     boolean isCfCode() -> s0
     boolean isCfWritableCode() -> t0
     1:1:java.lang.String toString():286:286 -> toString
-    1:1:boolean verifyNoInputReaders():1085:1085 -> z0
+    1:1:boolean verifyNoInputReaders():1085:1085 -> y0
+    1:20:void internalParseCode():151:170 -> z0
+    21:27:boolean verifyNoReparseContext(com.android.tools.r8.graph.DexClass):1090:1096 -> z0
+    21:27:void internalParseCode():170 -> z0
+    28:28:void internalParseCode():167:167 -> z0
 com.android.tools.r8.graph.LazyCfCode$ClassCodeVisitor -> com.android.tools.r8.graph.y2:
     java.util.function.BiFunction codeLocator -> d
     com.android.tools.r8.graph.JarApplicationReader application -> e
@@ -33160,7 +32984,7 @@
     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):330:336 -> <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[]):342:352 -> a
-com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.TA:
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.MA:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
@@ -33483,379 +33307,394 @@
     371:371:void visitInsn(int):667:667 -> a
     372:372:void visitInsn(int):664:664 -> a
     373:373:void visitInsn(int):661:661 -> a
-    409:409:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):809:809 -> a
-    410:411:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):506:507 -> a
-    410:411:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):810 -> a
-    412:415:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):810:813 -> a
-    416:416:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
-    416:416:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    417:417:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":424,"2":425,"3":426,"4":427,"5":428}}
-    424:424:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
-    424:424:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    425:425:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
-    425:425:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    426:426:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
-    426:426:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    427:427:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
-    427:427:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    428:428:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
-    428:428:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    418:418:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
-    418:418:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    419:419:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):63:63 -> a
-    419:419:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    420:420:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):61:61 -> a
-    420:420:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    421:421:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):59:59 -> a
-    421:421:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    422:422:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):57:57 -> a
-    422:422:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
-    423:423:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813:813 -> a
-    429:429:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818:818 -> a
-    430:430:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):98:98 -> a
-    430:430:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818 -> a
+    409:424:void visitTypeInsn(int,java.lang.String):788:803 -> a
+    425:425:void visitTypeInsn(int,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1245,"2":1246,"3":1247,"4":1248,"5":1249}}
+    1245:1245:void visitTypeInsn(int,java.lang.String):803:803 -> a
+    1246:1246:void visitTypeInsn(int,java.lang.String):803:803 -> a
+    1247:1247:void visitTypeInsn(int,java.lang.String):803:803 -> a
+    1248:1248:void visitTypeInsn(int,java.lang.String):803:803 -> a
+    1249:1249:void visitTypeInsn(int,java.lang.String):803:803 -> a
+    1228:1228:void visitTypeInsn(int,java.lang.String):803:803 -> a
+    1229:1229:void visitTypeInsn(int,java.lang.String):797:797 -> a
+    1230:1230:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    1230:1230:void visitTypeInsn(int,java.lang.String):797 -> a
+    1231:1231:void visitTypeInsn(int,java.lang.String):797:797 -> a
+    1232:1232:void visitTypeInsn(int,java.lang.String):794:794 -> a
+    1233:1233:void visitTypeInsn(int,java.lang.String):791:791 -> a
+    1250:1250:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):809:809 -> a
+    1251:1252:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):506:507 -> a
+    1251:1252:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):810 -> a
+    1253:1256:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):810:813 -> a
+    1257:1257:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
+    1257:1257:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1258:1258:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1265,"2":1266,"3":1267,"4":1268,"5":1269}}
+    1265:1265:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
+    1265:1265:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1266:1266:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
+    1266:1266:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1267:1267:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
+    1267:1267:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1268:1268:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
+    1268:1268:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1269:1269:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
+    1269:1269:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1259:1259:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
+    1259:1259:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1260:1260:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):62:62 -> a
+    1260:1260:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1261:1261:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):60:60 -> a
+    1261:1261:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1262:1262:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):58:58 -> a
+    1262:1262:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1263:1263:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):56:56 -> a
+    1263:1263:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813 -> a
+    1264:1264:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):813:813 -> a
+    1270:1270:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818:818 -> a
+    1271:1271:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):98:98 -> a
+    1271:1271:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    431:431:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):98:98 -> a
-    431:431:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818 -> a
-    432:432:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819:819 -> a
-    433:433:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    433:433:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819 -> a
+    1272:1272:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.JarApplicationReader.getMethod(java.lang.String,java.lang.String,java.lang.String):98:98 -> a
+    1272:1272:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):818 -> a
+    1273:1273:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819:819 -> a
+    1274:1274:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    1274:1274:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    434:434:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    434:434:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819 -> a
-    435:435:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819:819 -> a
-    436:436:boolean com.android.tools.r8.graph.DexItemFactory.isClassConstructor(com.android.tools.r8.graph.DexMethod):2860:2860 -> a
-    436:436:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819 -> a
-    437:437:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):822:822 -> a
-    438:438:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):820:820 -> a
-    439:439:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    439:439:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):820 -> a
-    440:440:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    440:440:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    440:440:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):820 -> a
-    441:441:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):820:820 -> a
-    442:443:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):827:828 -> a
-    444:447:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):87:90 -> a
-    444:447:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    448:448:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":504,"2":505,"3":506}}
-    504:504:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:90 -> a
-    504:504:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    505:505:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:90 -> a
-    505:505:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    506:506:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:90 -> a
-    506:506:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    449:449:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:90 -> a
-    449:449:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    450:450:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    450:450:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90 -> a
-    450:450:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    451:451:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    451:451:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    451:451:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90 -> a
-    451:451:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    452:459:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:97 -> a
-    452:459:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    460:481:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):317:338 -> a
-    460:481:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    460:481:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    482:482:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":507,"2":508,"3":509}}
-    507:507:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):338:338 -> a
-    507:507:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    507:507:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    508:508:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):338:338 -> a
-    508:508:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    508:508:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    509:509:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):338:338 -> a
-    509:509:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    509:509:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    483:483:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):338:338 -> a
-    483:483:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    483:483:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    484:494:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):332:342 -> a
-    484:494:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    484:494:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    495:495:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98:98 -> a
-    495:495:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    496:496:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):344:344 -> a
-    496:496:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    496:496:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    497:497:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":515,"2":516,"3":517}}
-    515:515:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):344:344 -> a
-    515:515:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    515:515:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    516:516:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):344:344 -> a
-    516:516:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    516:516:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    517:517:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):344:344 -> a
-    517:517:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    517:517:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    498:498:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):345:345 -> a
-    498:498:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
-    498:498:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    499:501:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):107:107 -> a
-    499:501:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):102 -> a
-    499:501:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    502:502:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexItemFactory.createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2767:2767 -> a
-    502:502:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):107 -> a
-    502:502:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):102 -> a
-    502:502:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
-    503:503:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):829:829 -> a
-    518:522:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):834:838 -> a
-    523:523:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    523:523:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    524:524:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1440,"2":1441,"3":1442,"4":1443,"5":1444}}
-    1440:1440:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1440:1440:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    1441:1441:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1441:1441:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    1442:1442:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1442:1442:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    1443:1443:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1443:1443:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    1444:1444:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1444:1444:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    525:525:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    525:525:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    526:526:com.android.tools.r8.ir.code.If$Type ifType(int):890:890 -> a
-    526:526:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    527:527:com.android.tools.r8.ir.code.If$Type ifType(int):887:887 -> a
-    527:527:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    528:528:com.android.tools.r8.ir.code.If$Type ifType(int):884:884 -> a
-    528:528:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    529:529:com.android.tools.r8.ir.code.If$Type ifType(int):881:881 -> a
-    529:529:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    530:530:com.android.tools.r8.ir.code.If$Type ifType(int):878:878 -> a
-    530:530:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    531:531:com.android.tools.r8.ir.code.If$Type ifType(int):874:874 -> a
-    531:531:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
-    532:542:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838:848 -> a
-    543:543:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    543:543:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    544:544:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1445,"2":1446,"3":1447,"4":1448,"5":1449}}
-    1445:1445:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1445:1445:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    1446:1446:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1446:1446:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    1447:1447:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1447:1447:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    1448:1448:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1448:1448:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    1449:1449:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    1449:1449:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    545:545:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
-    545:545:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    546:546:com.android.tools.r8.ir.code.If$Type ifType(int):890:890 -> a
-    546:546:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    547:547:com.android.tools.r8.ir.code.If$Type ifType(int):887:887 -> a
-    547:547:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    548:548:com.android.tools.r8.ir.code.If$Type ifType(int):884:884 -> a
-    548:548:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    549:549:com.android.tools.r8.ir.code.If$Type ifType(int):881:881 -> a
-    549:549:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    550:550:com.android.tools.r8.ir.code.If$Type ifType(int):878:878 -> a
-    550:550:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    551:551:com.android.tools.r8.ir.code.If$Type ifType(int):874:874 -> a
-    551:551:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
-    552:568:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848:864 -> a
-    569:569:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1450,"2":1451,"3":1452,"4":1453,"5":1454}}
-    1450:1450:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
-    1451:1451:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
-    1452:1452:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
-    1453:1453:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
-    1454:1454:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
-    1433:1433:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
-    1434:1438:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):858:862 -> a
-    1439:1439:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):854:854 -> a
-    1455:1455:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):898:898 -> a
-    1456:1462:void visitLdcInsn(java.lang.Object):903:909 -> a
-    1463:1463:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
-    1463:1463:void visitLdcInsn(java.lang.Object):909 -> a
-    1464:1481:void visitLdcInsn(java.lang.Object):909:926 -> a
-    1482:1486:void visitLdcInsn(java.lang.Object):924:928 -> a
-    1487:1514:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):86:113 -> a
-    1487:1514:void visitLdcInsn(java.lang.Object):929 -> a
-    1515:1515:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1515:1515:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):113 -> a
-    1515:1515:void visitLdcInsn(java.lang.Object):929 -> a
-    1516:1516:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1516:1516:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1516:1516:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):113 -> a
-    1516:1516:void visitLdcInsn(java.lang.Object):929 -> a
-    1517:1519:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):113:115 -> a
-    1517:1519:void visitLdcInsn(java.lang.Object):929 -> a
-    1520:1520:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
-    1520:1520:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):115 -> a
+    1275:1275:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    1275:1275:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819 -> a
+    1276:1276:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819:819 -> a
+    1277:1277:boolean com.android.tools.r8.graph.DexItemFactory.isClassConstructor(com.android.tools.r8.graph.DexMethod):2858:2858 -> a
+    1277:1277:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):819 -> a
+    1278:1278:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):822:822 -> a
+    1279:1279:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):820:820 -> a
+    1280:1280:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1280:1280:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):820 -> a
+    1281:1281:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1281:1281:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1281:1281:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):820 -> a
+    1282:1282:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):820:820 -> a
+    1283:1284:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):827:828 -> a
+    1285:1288:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):87:90 -> a
+    1285:1288:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1289:1289:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1345,"2":1346,"3":1347}}
+    1345:1345:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:90 -> a
+    1345:1345:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1346:1346:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:90 -> a
+    1346:1346:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1347:1347:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:90 -> a
+    1347:1347:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1290:1290:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:90 -> a
+    1290:1290:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1291:1291:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1291:1291:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90 -> a
+    1291:1291:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1292:1292:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1292:1292:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1292:1292:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90 -> a
+    1292:1292:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1293:1300:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):90:97 -> a
+    1293:1300:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1301:1322:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):317:338 -> a
+    1301:1322:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1301:1322:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1323:1323:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1348,"2":1349,"3":1350}}
+    1348:1348:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):338:338 -> a
+    1348:1348:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1348:1348:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1349:1349:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):338:338 -> a
+    1349:1349:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1349:1349:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1350:1350:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):338:338 -> a
+    1350:1350:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1350:1350:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1324:1324:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):338:338 -> a
+    1324:1324:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1324:1324:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1325:1335:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):332:342 -> a
+    1325:1335:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1325:1335:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1336:1336:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98:98 -> a
+    1336:1336:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1337:1337:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):344:344 -> a
+    1337:1337:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1337:1337:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1338:1338:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1356,"2":1357,"3":1358}}
+    1356:1356:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):344:344 -> a
+    1356:1356:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1356:1356:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1357:1357:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):344:344 -> a
+    1357:1357:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1357:1357:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1358:1358:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):344:344 -> a
+    1358:1358:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1358:1358:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1339:1339:com.android.tools.r8.graph.DexValue com.android.tools.r8.graph.DexValue.fromAsmBootstrapArgument(java.lang.Object,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):345:345 -> a
+    1339:1339:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):98 -> a
+    1339:1339:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1340:1342:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):107:107 -> a
+    1340:1342:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):102 -> a
+    1340:1342:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1343:1343:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexItemFactory.createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2765:2765 -> a
+    1343:1343:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.JarApplicationReader.getCallSite(java.lang.String,java.lang.String,com.android.tools.r8.graph.DexMethodHandle,java.util.List):107 -> a
+    1343:1343:com.android.tools.r8.graph.DexCallSite com.android.tools.r8.graph.DexCallSite.fromAsmInvokeDynamic(com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):102 -> a
+    1343:1343:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):828 -> a
+    1344:1344:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):829:829 -> a
+    1359:1363:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):834:838 -> a
+    1364:1364:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    1364:1364:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1365:1365:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2281,"2":2282,"3":2283,"4":2284,"5":2285}}
+    2281:2281:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2281:2281:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    2282:2282:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2282:2282:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    2283:2283:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2283:2283:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    2284:2284:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2284:2284:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    2285:2285:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2285:2285:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1366:1366:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    1366:1366:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1367:1367:com.android.tools.r8.ir.code.If$Type ifType(int):890:890 -> a
+    1367:1367:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1368:1368:com.android.tools.r8.ir.code.If$Type ifType(int):887:887 -> a
+    1368:1368:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1369:1369:com.android.tools.r8.ir.code.If$Type ifType(int):884:884 -> a
+    1369:1369:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1370:1370:com.android.tools.r8.ir.code.If$Type ifType(int):881:881 -> a
+    1370:1370:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1371:1371:com.android.tools.r8.ir.code.If$Type ifType(int):878:878 -> a
+    1371:1371:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1372:1372:com.android.tools.r8.ir.code.If$Type ifType(int):874:874 -> a
+    1372:1372:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838 -> a
+    1373:1383:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):838:848 -> a
+    1384:1384:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    1384:1384:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1385:1385:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2286,"2":2287,"3":2288,"4":2289,"5":2290}}
+    2286:2286:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2286:2286:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    2287:2287:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2287:2287:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    2288:2288:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2288:2288:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    2289:2289:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2289:2289:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    2290:2290:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    2290:2290:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1386:1386:com.android.tools.r8.ir.code.If$Type ifType(int):892:892 -> a
+    1386:1386:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1387:1387:com.android.tools.r8.ir.code.If$Type ifType(int):890:890 -> a
+    1387:1387:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1388:1388:com.android.tools.r8.ir.code.If$Type ifType(int):887:887 -> a
+    1388:1388:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1389:1389:com.android.tools.r8.ir.code.If$Type ifType(int):884:884 -> a
+    1389:1389:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1390:1390:com.android.tools.r8.ir.code.If$Type ifType(int):881:881 -> a
+    1390:1390:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1391:1391:com.android.tools.r8.ir.code.If$Type ifType(int):878:878 -> a
+    1391:1391:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1392:1392:com.android.tools.r8.ir.code.If$Type ifType(int):874:874 -> a
+    1392:1392:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848 -> a
+    1393:1409:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):848:864 -> a
+    1410:1410:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2291,"2":2292,"3":2293,"4":2294,"5":2295}}
+    2291:2291:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
+    2292:2292:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
+    2293:2293:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
+    2294:2294:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
+    2295:2295:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
+    2274:2274:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):864:864 -> a
+    2275:2279:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):858:862 -> a
+    2280:2280:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):854:854 -> a
+    2296:2296:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):898:898 -> a
+    2297:2303:void visitLdcInsn(java.lang.Object):903:909 -> a
+    2304:2304:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    2304:2304:void visitLdcInsn(java.lang.Object):909 -> a
+    2305:2322:void visitLdcInsn(java.lang.Object):909:926 -> a
+    2323:2327:void visitLdcInsn(java.lang.Object):924:928 -> a
+    2328:2355:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):86:113 -> a
+    2328:2355:void visitLdcInsn(java.lang.Object):929 -> a
+    2356:2356:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2356:2356:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):113 -> a
+    2356:2356:void visitLdcInsn(java.lang.Object):929 -> a
+    2357:2357:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2357:2357:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2357:2357:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):113 -> a
+    2357:2357:void visitLdcInsn(java.lang.Object):929 -> a
+    2358:2360:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):113:115 -> a
+    2358:2360:void visitLdcInsn(java.lang.Object):929 -> a
+    2361:2361:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
+    2361:2361:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1520:1520:void visitLdcInsn(java.lang.Object):929 -> a
-    1521:1524:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):115:118 -> a
-    1521:1524:void visitLdcInsn(java.lang.Object):929 -> a
-    1525:1525:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
-    1525:1525:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):118 -> a
+    2361:2361:void visitLdcInsn(java.lang.Object):929 -> a
+    2362:2365:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):115:118 -> a
+    2362:2365:void visitLdcInsn(java.lang.Object):929 -> a
+    2366:2366:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
+    2366:2366:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):118 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1525:1525:void visitLdcInsn(java.lang.Object):929 -> a
-    1526:1526:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):118:118 -> a
-    1526:1526:void visitLdcInsn(java.lang.Object):929 -> a
-    1527:1527:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    1527:1527:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):118 -> a
-    1527:1527:void visitLdcInsn(java.lang.Object):929 -> a
-    1528:1532:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):118:122 -> a
-    1528:1532:void visitLdcInsn(java.lang.Object):929 -> a
-    1533:1533:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
-    1533:1533:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):122 -> a
+    2366:2366:void visitLdcInsn(java.lang.Object):929 -> a
+    2367:2367:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):118:118 -> a
+    2367:2367:void visitLdcInsn(java.lang.Object):929 -> a
+    2368:2368:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    2368:2368:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):118 -> a
+    2368:2368:void visitLdcInsn(java.lang.Object):929 -> a
+    2369:2373:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):118:122 -> a
+    2369:2373:void visitLdcInsn(java.lang.Object):929 -> a
+    2374:2374:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
+    2374:2374:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):122 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1533:1533:void visitLdcInsn(java.lang.Object):929 -> a
-    1534:1534:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):122:122 -> a
-    1534:1534:void visitLdcInsn(java.lang.Object):929 -> a
-    1535:1535:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    1535:1535:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):122 -> a
-    1535:1535:void visitLdcInsn(java.lang.Object):929 -> a
-    1536:1540:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):122:126 -> a
-    1536:1540:void visitLdcInsn(java.lang.Object):929 -> a
-    1541:1541:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
-    1541:1541:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126 -> a
+    2374:2374:void visitLdcInsn(java.lang.Object):929 -> a
+    2375:2375:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):122:122 -> a
+    2375:2375:void visitLdcInsn(java.lang.Object):929 -> a
+    2376:2376:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    2376:2376:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):122 -> a
+    2376:2376:void visitLdcInsn(java.lang.Object):929 -> a
+    2377:2381:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):122:126 -> a
+    2377:2381:void visitLdcInsn(java.lang.Object):929 -> a
+    2382:2382:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
+    2382:2382:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1541:1541:void visitLdcInsn(java.lang.Object):929 -> a
-    1542:1542:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126:126 -> a
-    1542:1542:void visitLdcInsn(java.lang.Object):929 -> a
-    1543:1543:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    1543:1543:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126 -> a
-    1543:1543:void visitLdcInsn(java.lang.Object):929 -> a
-    1544:1550:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126:132 -> a
-    1544:1550:void visitLdcInsn(java.lang.Object):929 -> a
-    1551:1551:void visitLdcInsn(java.lang.Object):928:928 -> a
-    1552:1552:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):127:127 -> a
-    1552:1552:void visitLdcInsn(java.lang.Object):929 -> a
-    1553:1553:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1553:1553:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):127 -> a
-    1553:1553:void visitLdcInsn(java.lang.Object):929 -> a
-    1554:1554:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1554:1554:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1554:1554:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):127 -> a
-    1554:1554:void visitLdcInsn(java.lang.Object):929 -> a
-    1555:1555:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):127:127 -> a
-    1555:1555:void visitLdcInsn(java.lang.Object):929 -> a
-    1556:1556:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):123:123 -> a
-    1556:1556:void visitLdcInsn(java.lang.Object):929 -> a
-    1557:1557:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1557:1557:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):123 -> a
-    1557:1557:void visitLdcInsn(java.lang.Object):929 -> a
-    1558:1558:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1558:1558:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1558:1558:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):123 -> a
-    1558:1558:void visitLdcInsn(java.lang.Object):929 -> a
-    1559:1559:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):123:123 -> a
-    1559:1559:void visitLdcInsn(java.lang.Object):929 -> a
-    1560:1560:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):119:119 -> a
-    1560:1560:void visitLdcInsn(java.lang.Object):929 -> a
-    1561:1561:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1561:1561:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):119 -> a
-    1561:1561:void visitLdcInsn(java.lang.Object):929 -> a
-    1562:1562:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1562:1562:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1562:1562:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):119 -> a
-    1562:1562:void visitLdcInsn(java.lang.Object):929 -> a
-    1563:1563:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):119:119 -> a
-    1563:1563:void visitLdcInsn(java.lang.Object):929 -> a
-    1564:1564:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):116:116 -> a
-    1564:1564:void visitLdcInsn(java.lang.Object):929 -> a
-    1565:1565:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1565:1565:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):116 -> a
-    1565:1565:void visitLdcInsn(java.lang.Object):929 -> a
-    1566:1566:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1566:1566:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1566:1566:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):116 -> a
-    1566:1566:void visitLdcInsn(java.lang.Object):929 -> a
-    1567:1567:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):116:116 -> a
-    1567:1567:void visitLdcInsn(java.lang.Object):929 -> a
-    1568:1568:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107:107 -> a
-    1568:1568:void visitLdcInsn(java.lang.Object):929 -> a
-    1569:1569:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1569:1569:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107 -> a
-    1569:1569:void visitLdcInsn(java.lang.Object):929 -> a
-    1570:1570:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1570:1570:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1570:1570:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107 -> a
-    1570:1570:void visitLdcInsn(java.lang.Object):929 -> a
-    1571:1571:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107:107 -> a
-    1571:1571:void visitLdcInsn(java.lang.Object):929 -> a
-    1572:1572:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):101:101 -> a
-    1572:1572:void visitLdcInsn(java.lang.Object):929 -> a
-    1573:1573:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1573:1573:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):101 -> a
-    1573:1573:void visitLdcInsn(java.lang.Object):929 -> a
-    1574:1574:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1574:1574:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1574:1574:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):101 -> a
-    1574:1574:void visitLdcInsn(java.lang.Object):929 -> a
-    1575:1575:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):101:101 -> a
-    1575:1575:void visitLdcInsn(java.lang.Object):929 -> a
-    1576:1576:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):97:97 -> a
-    1576:1576:void visitLdcInsn(java.lang.Object):929 -> a
-    1577:1577:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1577:1577:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):97 -> a
-    1577:1577:void visitLdcInsn(java.lang.Object):929 -> a
-    1578:1578:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1578:1578:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1578:1578:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):97 -> a
-    1578:1578:void visitLdcInsn(java.lang.Object):929 -> a
-    1579:1579:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):97:97 -> a
-    1579:1579:void visitLdcInsn(java.lang.Object):929 -> a
-    1580:1580:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):94:94 -> a
-    1580:1580:void visitLdcInsn(java.lang.Object):929 -> a
-    1581:1581:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1581:1581:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):94 -> a
-    1581:1581:void visitLdcInsn(java.lang.Object):929 -> a
-    1582:1582:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1582:1582:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1582:1582:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):94 -> a
-    1582:1582:void visitLdcInsn(java.lang.Object):929 -> a
-    1583:1583:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):94:94 -> a
-    1583:1583:void visitLdcInsn(java.lang.Object):929 -> a
-    1584:1584:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):90:90 -> a
-    1584:1584:void visitLdcInsn(java.lang.Object):929 -> a
-    1585:1585:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1585:1585:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):90 -> a
-    1585:1585:void visitLdcInsn(java.lang.Object):929 -> a
-    1586:1586:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1586:1586:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1586:1586:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):90 -> a
-    1586:1586:void visitLdcInsn(java.lang.Object):929 -> a
-    1587:1587:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):90:90 -> a
-    1587:1587:void visitLdcInsn(java.lang.Object):929 -> a
-    1588:1588:void visitLdcInsn(java.lang.Object):932:932 -> a
-    1589:1589:void visitLdcInsn(java.lang.Object):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2525,"2":2526,"3":2527}}
-    2525:2525:void visitLdcInsn(java.lang.Object):932:932 -> a
-    2526:2526:void visitLdcInsn(java.lang.Object):932:932 -> a
-    2527:2527:void visitLdcInsn(java.lang.Object):932:932 -> a
-    2521:2521:void visitLdcInsn(java.lang.Object):932:932 -> a
-    2522:2522:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    2522:2522:void visitLdcInsn(java.lang.Object):932 -> a
-    2523:2523:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    2523:2523:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    2523:2523:void visitLdcInsn(java.lang.Object):932 -> a
-    2524:2524:void visitLdcInsn(java.lang.Object):932:932 -> a
-    2528:2528:void visitIincInsn(int,int):938:938 -> a
-    2529:2534:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):943:948 -> a
-    2535:2539:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):953:957 -> a
-    2540:2581:void visitMultiANewArrayInsn(java.lang.String,int):962:1003 -> a
-    2582:2582:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1010:1010 -> a
-    2583:2584:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):506:507 -> a
-    2583:2584:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1010 -> a
-    2585:2588:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1009:1012 -> a
-    2589:2595:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1018:1024 -> a
-    2596:2602:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1020:1026 -> a
-    2603:2604: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):99:100 -> a
-    2603:2604:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1026 -> a
-    2605:2605:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1025:1025 -> a
-    2606:2606:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):1031:1031 -> a
+    2382:2382:void visitLdcInsn(java.lang.Object):929 -> a
+    2383:2383:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126:126 -> a
+    2383:2383:void visitLdcInsn(java.lang.Object):929 -> a
+    2384:2384:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    2384:2384:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126 -> a
+    2384:2384:void visitLdcInsn(java.lang.Object):929 -> a
+    2385:2391:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):126:132 -> a
+    2385:2391:void visitLdcInsn(java.lang.Object):929 -> a
+    2392:2392:void visitLdcInsn(java.lang.Object):928:928 -> a
+    2393:2393:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):127:127 -> a
+    2393:2393:void visitLdcInsn(java.lang.Object):929 -> a
+    2394:2394:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2394:2394:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):127 -> a
+    2394:2394:void visitLdcInsn(java.lang.Object):929 -> a
+    2395:2395:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2395:2395:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2395:2395:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):127 -> a
+    2395:2395:void visitLdcInsn(java.lang.Object):929 -> a
+    2396:2396:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):127:127 -> a
+    2396:2396:void visitLdcInsn(java.lang.Object):929 -> a
+    2397:2397:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):123:123 -> a
+    2397:2397:void visitLdcInsn(java.lang.Object):929 -> a
+    2398:2398:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2398:2398:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):123 -> a
+    2398:2398:void visitLdcInsn(java.lang.Object):929 -> a
+    2399:2399:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2399:2399:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2399:2399:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):123 -> a
+    2399:2399:void visitLdcInsn(java.lang.Object):929 -> a
+    2400:2400:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):123:123 -> a
+    2400:2400:void visitLdcInsn(java.lang.Object):929 -> a
+    2401:2401:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):119:119 -> a
+    2401:2401:void visitLdcInsn(java.lang.Object):929 -> a
+    2402:2402:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2402:2402:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):119 -> a
+    2402:2402:void visitLdcInsn(java.lang.Object):929 -> a
+    2403:2403:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2403:2403:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2403:2403:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):119 -> a
+    2403:2403:void visitLdcInsn(java.lang.Object):929 -> a
+    2404:2404:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):119:119 -> a
+    2404:2404:void visitLdcInsn(java.lang.Object):929 -> a
+    2405:2405:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):116:116 -> a
+    2405:2405:void visitLdcInsn(java.lang.Object):929 -> a
+    2406:2406:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2406:2406:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):116 -> a
+    2406:2406:void visitLdcInsn(java.lang.Object):929 -> a
+    2407:2407:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2407:2407:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2407:2407:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):116 -> a
+    2407:2407:void visitLdcInsn(java.lang.Object):929 -> a
+    2408:2408:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):116:116 -> a
+    2408:2408:void visitLdcInsn(java.lang.Object):929 -> a
+    2409:2409:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107:107 -> a
+    2409:2409:void visitLdcInsn(java.lang.Object):929 -> a
+    2410:2410:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2410:2410:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107 -> a
+    2410:2410:void visitLdcInsn(java.lang.Object):929 -> a
+    2411:2411:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2411:2411:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2411:2411:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107 -> a
+    2411:2411:void visitLdcInsn(java.lang.Object):929 -> a
+    2412:2412:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):107:107 -> a
+    2412:2412:void visitLdcInsn(java.lang.Object):929 -> a
+    2413:2413:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):101:101 -> a
+    2413:2413:void visitLdcInsn(java.lang.Object):929 -> a
+    2414:2414:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2414:2414:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):101 -> a
+    2414:2414:void visitLdcInsn(java.lang.Object):929 -> a
+    2415:2415:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2415:2415:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2415:2415:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):101 -> a
+    2415:2415:void visitLdcInsn(java.lang.Object):929 -> a
+    2416:2416:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):101:101 -> a
+    2416:2416:void visitLdcInsn(java.lang.Object):929 -> a
+    2417:2417:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):97:97 -> a
+    2417:2417:void visitLdcInsn(java.lang.Object):929 -> a
+    2418:2418:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2418:2418:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):97 -> a
+    2418:2418:void visitLdcInsn(java.lang.Object):929 -> a
+    2419:2419:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2419:2419:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2419:2419:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):97 -> a
+    2419:2419:void visitLdcInsn(java.lang.Object):929 -> a
+    2420:2420:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):97:97 -> a
+    2420:2420:void visitLdcInsn(java.lang.Object):929 -> a
+    2421:2421:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):94:94 -> a
+    2421:2421:void visitLdcInsn(java.lang.Object):929 -> a
+    2422:2422:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2422:2422:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):94 -> a
+    2422:2422:void visitLdcInsn(java.lang.Object):929 -> a
+    2423:2423:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2423:2423:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2423:2423:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):94 -> a
+    2423:2423:void visitLdcInsn(java.lang.Object):929 -> a
+    2424:2424:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):94:94 -> a
+    2424:2424:void visitLdcInsn(java.lang.Object):929 -> a
+    2425:2425:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):90:90 -> a
+    2425:2425:void visitLdcInsn(java.lang.Object):929 -> a
+    2426:2426:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    2426:2426:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):90 -> a
+    2426:2426:void visitLdcInsn(java.lang.Object):929 -> a
+    2427:2427:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    2427:2427:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    2427:2427:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):90 -> a
+    2427:2427:void visitLdcInsn(java.lang.Object):929 -> a
+    2428:2428:com.android.tools.r8.cf.code.CfConstDynamic com.android.tools.r8.cf.code.CfConstDynamic.fromAsmConstantDynamic(com.android.tools.r8.org.objectweb.asm.ConstantDynamic,com.android.tools.r8.graph.JarApplicationReader,com.android.tools.r8.graph.DexType):90:90 -> a
+    2428:2428:void visitLdcInsn(java.lang.Object):929 -> a
+    2429:2429:void visitLdcInsn(java.lang.Object):932:932 -> a
+    2430:2430:void visitLdcInsn(java.lang.Object):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3366,"2":3367,"3":3368}}
+    3366:3366:void visitLdcInsn(java.lang.Object):932:932 -> a
+    3367:3367:void visitLdcInsn(java.lang.Object):932:932 -> a
+    3368:3368:void visitLdcInsn(java.lang.Object):932:932 -> a
+    3362:3362:void visitLdcInsn(java.lang.Object):932:932 -> a
+    3363:3363:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    3363:3363:void visitLdcInsn(java.lang.Object):932 -> a
+    3364:3364:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    3364:3364:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    3364:3364:void visitLdcInsn(java.lang.Object):932 -> a
+    3365:3365:void visitLdcInsn(java.lang.Object):932:932 -> a
+    3369:3369:void visitIincInsn(int,int):938:938 -> a
+    3370:3375:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):943:948 -> a
+    3376:3380:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):953:957 -> a
+    3381:3422:void visitMultiANewArrayInsn(java.lang.String,int):962:1003 -> a
+    3423:3423:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1010:1010 -> a
+    3424:3425:com.android.tools.r8.graph.DexType createTypeFromInternalType(java.lang.String):506:507 -> a
+    3424:3425:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1010 -> a
+    3426:3429:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1009:1012 -> a
+    3430:3436:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1018:1024 -> a
+    3437:3443:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1020:1026 -> a
+    3444:3445: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):100:101 -> a
+    3444:3445:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1026 -> a
+    3446:3446:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1025:1025 -> a
+    3447:3447:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):1031:1031 -> a
     1:6:void visitCode():395:400 -> b
     7:11:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(java.lang.Object):471:475 -> b
     12:24:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):487:499 -> b
@@ -33925,36 +33764,21 @@
     20:25:void visitEnd():414:419 -> c
     26:31:com.android.tools.r8.position.Position getDiagnosticPosition():428:433 -> c
     26:31:void visitEnd():424 -> c
-    32:32:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> c
+    32:32:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> c
     32:32:void visitEnd():424 -> c
-    33:33:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> c
+    33:33:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> c
     33:33:void visitEnd():424 -> c
     34:34:void visitEnd():416:416 -> c
     35:35:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.org.objectweb.asm.Label):483:483 -> c
-    36:51:void visitTypeInsn(int,java.lang.String):788:803 -> c
-    52:52:void visitTypeInsn(int,java.lang.String):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":872,"2":873,"3":874,"4":875,"5":876}}
-    872:872:void visitTypeInsn(int,java.lang.String):803:803 -> c
-    873:873:void visitTypeInsn(int,java.lang.String):803:803 -> c
-    874:874:void visitTypeInsn(int,java.lang.String):803:803 -> c
-    875:875:void visitTypeInsn(int,java.lang.String):803:803 -> c
-    876:876:void visitTypeInsn(int,java.lang.String):803:803 -> c
-    855:855:void visitTypeInsn(int,java.lang.String):803:803 -> c
-    856:856:void visitTypeInsn(int,java.lang.String):797:797 -> c
-    857:857:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> c
-    857:857:void visitTypeInsn(int,java.lang.String):797 -> c
-    858:858:void visitTypeInsn(int,java.lang.String):797:797 -> c
-    859:859:void visitTypeInsn(int,java.lang.String):794:794 -> c
-    860:860:void visitTypeInsn(int,java.lang.String):791:791 -> c
-    877:880:void visitMaxs(int,int):1047:1050 -> c
+    36:39:void visitMaxs(int,int):1047:1050 -> c
     1:1:void visitVarInsn(int,int):777:777 -> d
     2:2:void visitVarInsn(int,int):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":821,"2":822,"3":823,"4":824,"5":825}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":818,"2":819,"3":820,"4":821,"5":822}}
+    818:818:void visitVarInsn(int,int):777:777 -> d
+    819:819:void visitVarInsn(int,int):777:777 -> d
+    820:820:void visitVarInsn(int,int):777:777 -> d
     821:821:void visitVarInsn(int,int):777:777 -> d
     822:822:void visitVarInsn(int,int):777:777 -> d
-    823:823:void visitVarInsn(int,int):777:777 -> d
-    824:824:void visitVarInsn(int,int):777:777 -> d
-    825:825:void visitVarInsn(int,int):777:777 -> d
     779:779:void visitVarInsn(int,int):777:777 -> d
     780:780:void visitVarInsn(int,int):769:769 -> d
     781:781:void visitVarInsn(int,int):765:765 -> d
@@ -33971,97 +33795,95 @@
     2:5:void <init>(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.graph.DexApplicationReadFlags,com.android.tools.r8.utils.ProgramClassCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.utils.ClasspathClassCollection,com.android.tools.r8.utils.LibraryClassCollection,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.Timing):44:47 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(java.util.Map,java.util.function.Function,com.android.tools.r8.utils.InternalOptions):27:27 -> a
     2:2:com.android.tools.r8.utils.ClasspathClassCollection access$100(com.android.tools.r8.graph.LazyLoadedDexApplication):27:27 -> a
-    3:3:void forEachLibraryType(java.util.function.Consumer):63:63 -> a
-    4:8:void lambda$fillPrioritizedClasses$1(java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):225:229 -> a
-    9:10:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    9:10:void lambda$fillPrioritizedClasses$1(java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):229 -> a
-    11:11:void lambda$fillPrioritizedClasses$1(java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):230:230 -> a
-    12:25:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):244:257 -> a
-    26:26:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":286,"2":287,"3":288}}
-    286:286:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):257:257 -> a
-    287:287:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):257:257 -> a
-    288:288:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):257:257 -> a
-    285:285:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):259:259 -> a
+    3:7:void lambda$fillPrioritizedClasses$1(java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):215:219 -> a
+    8:9:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    8:9:void lambda$fillPrioritizedClasses$1(java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):219 -> a
+    10:10:void lambda$fillPrioritizedClasses$1(java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):220:220 -> a
+    11:24:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):234:247 -> a
+    25:25:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":275,"2":276,"3":277}}
+    275:275:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):247:247 -> a
+    276:276:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):247:247 -> a
+    277:277:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):247:247 -> a
+    274:274:void warnJavaLibraryOverride(com.android.tools.r8.utils.InternalOptions,java.util.Set):249:249 -> a
     1:1:com.android.tools.r8.utils.LibraryClassCollection access$200(com.android.tools.r8.graph.LazyLoadedDexApplication):27:27 -> b
-    2:2:void forEachProgramType(java.util.function.Consumer):58:58 -> b
-    3:20:com.android.tools.r8.com.google.common.collect.ImmutableMap fillPrioritizedClasses(java.util.Map,java.util.function.Function,com.android.tools.r8.utils.InternalOptions):221:238 -> b
-    1:1:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):120:120 -> c
+    2:19:com.android.tools.r8.com.google.common.collect.ImmutableMap fillPrioritizedClasses(java.util.Map,java.util.function.Function,com.android.tools.r8.utils.InternalOptions):211:228 -> b
+    1:1:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):110:110 -> c
     2:2:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":124,"2":125,"3":126,"4":127,"5":128}}
-    124:124:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):120:120 -> c
-    125:125:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):120:120 -> c
-    126:126:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):120:120 -> c
-    127:127:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):120:120 -> c
-    128:128:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):120:120 -> c
-    122:123:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):120:121 -> c
-    129:129:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder():328:328 -> c
-    129:129:com.android.tools.r8.graph.DexApplication$Builder builder():27 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":114,"2":115,"3":116,"4":117,"5":118}}
+    114:114:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):110:110 -> c
+    115:115:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):110:110 -> c
+    116:116:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):110:110 -> c
+    117:117:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):110:110 -> c
+    118:118:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):110:110 -> c
+    112:113:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType):110:111 -> c
+    119:119:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder builder():318:318 -> c
+    119:119:com.android.tools.r8.graph.DexApplication$Builder builder():27 -> c
     1:1:com.android.tools.r8.graph.ClassResolutionResult$Builder com.android.tools.r8.graph.ClassResolutionResult.builder():20:20 -> d
-    1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):68 -> d
-    2:3:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):69:70 -> d
-    4:4:boolean addClassToBuilderIfNotNull(com.android.tools.r8.graph.DexClass,java.util.function.Consumer):85:85 -> d
-    4:4:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):70 -> d
-    5:6:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):72:73 -> d
-    7:7:boolean addClassToBuilderIfNotNull(com.android.tools.r8.graph.DexClass,java.util.function.Consumer):85:85 -> d
-    7:7:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):73 -> d
-    8:9:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):76:77 -> d
-    10:10:boolean addClassToBuilderIfNotNull(com.android.tools.r8.graph.DexClass,java.util.function.Consumer):85:85 -> d
-    10:10:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):77 -> d
-    11:11:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):80:80 -> d
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):94:94 -> e
+    1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):58 -> d
+    2:3:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):59:60 -> d
+    4:4:boolean addClassToBuilderIfNotNull(com.android.tools.r8.graph.DexClass,java.util.function.Consumer):75:75 -> d
+    4:4:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):60 -> d
+    5:6:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):62:63 -> d
+    7:7:boolean addClassToBuilderIfNotNull(com.android.tools.r8.graph.DexClass,java.util.function.Consumer):75:75 -> d
+    7:7:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):63 -> d
+    8:9:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):66:67 -> d
+    10:10:boolean addClassToBuilderIfNotNull(com.android.tools.r8.graph.DexClass,java.util.function.Consumer):75:75 -> d
+    10:10:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):67 -> d
+    11:11:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):70:70 -> d
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84:84 -> e
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":115,"2":116,"3":117,"4":118,"5":119}}
-    115:115:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):94:94 -> e
-    116:116:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):94:94 -> e
-    117:117:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):94:94 -> e
-    118:118:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):94:94 -> e
-    119:119:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):94:94 -> e
-    96:114:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):94:112 -> e
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":105,"2":106,"3":107,"4":108,"5":109}}
+    105:105:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84:84 -> e
+    106:106:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84:84 -> e
+    107:107:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84:84 -> e
+    108:108:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84:84 -> e
+    109:109:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84:84 -> e
+    86:104:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):84:102 -> e
     boolean lambda$programClasses$0(com.android.tools.r8.graph.DexType) -> f
     1:1:java.util.Collection programClasses():27:27 -> h
-    1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():333:333 -> i
-    1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():266:266 -> j
+    1:1:com.android.tools.r8.graph.DirectMappedDexApplication toDirect():323:323 -> i
+    1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses loadAllClasses():256:256 -> j
     1:2:java.util.List programClasses():52:53 -> k
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":345,"2":346,"3":347}}
-    345:345:java.lang.String toString():343:343 -> toString
-    346:346:java.lang.String toString():343:343 -> toString
-    347:347:java.lang.String toString():343:343 -> toString
-    344:344:java.lang.String toString():343:343 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":335,"2":336,"3":337}}
+    335:335:java.lang.String toString():333:333 -> toString
+    336:336:java.lang.String toString():333:333 -> toString
+    337:337:java.lang.String toString():333:333 -> toString
+    334:334:java.lang.String toString():333:333 -> toString
 com.android.tools.r8.graph.LazyLoadedDexApplication$AllClasses -> com.android.tools.r8.graph.D2:
     com.android.tools.r8.com.google.common.collect.ImmutableMap libraryClasses -> c
     com.android.tools.r8.com.google.common.collect.ImmutableMap classpathClasses -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap programClasses -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():129:129 -> <clinit>
-    1:52:void <init>(com.android.tools.r8.utils.LibraryClassCollection,com.android.tools.r8.utils.ClasspathClassCollection,com.android.tools.r8.utils.ProgramClassCollection,com.android.tools.r8.utils.InternalOptions):141:192 -> <init>
+    1:1:void <clinit>():119:119 -> <clinit>
+    1:52:void <init>(com.android.tools.r8.utils.LibraryClassCollection,com.android.tools.r8.utils.ClasspathClassCollection,com.android.tools.r8.utils.ProgramClassCollection,com.android.tools.r8.utils.InternalOptions):131:182 -> <init>
     boolean lambda$new$0(com.android.tools.r8.graph.DexType) -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getClasspathClasses():208:208 -> a
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getClasspathClasses():198:198 -> a
     boolean lambda$new$1(com.android.tools.r8.graph.DexType) -> b
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getLibraryClasses():212:212 -> b
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getLibraryClasses():202:202 -> b
     boolean lambda$new$2(com.android.tools.r8.graph.DexType) -> c
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getProgramClasses():204:204 -> c
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap getProgramClasses():194:194 -> c
     com.android.tools.r8.graph.DexClass lambda$new$3(com.android.tools.r8.graph.DexType) -> d
-    1:2:com.android.tools.r8.graph.DexClass lambda$new$4(com.android.tools.r8.graph.DexType):183:184 -> e
+    1:2:com.android.tools.r8.graph.DexClass lambda$new$4(com.android.tools.r8.graph.DexType):173:174 -> e
     com.android.tools.r8.graph.DexClass lambda$new$5(com.android.tools.r8.graph.DexType) -> f
-    1:2:com.android.tools.r8.graph.DexClass lambda$new$6(com.android.tools.r8.graph.DexType):195:196 -> g
+    1:2:com.android.tools.r8.graph.DexClass lambda$new$6(com.android.tools.r8.graph.DexType):185:186 -> g
 com.android.tools.r8.graph.LazyLoadedDexApplication$Builder -> com.android.tools.r8.graph.E2$a:
     com.android.tools.r8.utils.LibraryClassCollection libraryClasses -> j
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver resolver -> k
     com.android.tools.r8.utils.ClasspathClassCollection classpathClasses -> i
-    1:1:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.graph.LazyLoadedDexApplication$1):269:269 -> <init>
-    2:5:void <init>(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):276:279 -> <init>
-    6:9:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):283:286 -> <init>
-    1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setClasspathClassCollection(com.android.tools.r8.utils.ClasspathClassCollection):295:295 -> a
-    2:2:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):300:300 -> a
-    1:1:com.android.tools.r8.graph.DexApplication build():269:269 -> b
-    2:4:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):306:308 -> b
+    1:1:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.graph.LazyLoadedDexApplication$1):259:259 -> <init>
+    2:5:void <init>(com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):266:269 -> <init>
+    6:9:void <init>(com.android.tools.r8.graph.LazyLoadedDexApplication):273:276 -> <init>
+    1:1:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setClasspathClassCollection(com.android.tools.r8.utils.ClasspathClassCollection):285:285 -> a
+    2:2:com.android.tools.r8.graph.LazyLoadedDexApplication$Builder setLibraryClassCollection(com.android.tools.r8.utils.LibraryClassCollection):290:290 -> a
+    1:1:com.android.tools.r8.graph.DexApplication build():259:259 -> b
+    2:4:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):296:298 -> b
     com.android.tools.r8.graph.DexApplication$Builder self() -> d
-    1:5:com.android.tools.r8.graph.LazyLoadedDexApplication build():313:317 -> e
-com.android.tools.r8.graph.LibraryClass -> com.android.tools.r8.internal.kB:
+    1:5:com.android.tools.r8.graph.LazyLoadedDexApplication build():303:307 -> e
+com.android.tools.r8.graph.LibraryClass -> com.android.tools.r8.internal.dB:
     1:1:com.android.tools.r8.graph.DexClass asDexClass():11:11 -> h
-com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.mB:
+com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.fB:
     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.F2:
     boolean $assertionsDisabled -> f
@@ -34105,7 +33927,7 @@
     32:33:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
     32:33:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):79 -> a
     32:33: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.aD:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.TC:
     com.android.tools.r8.graph.DexClassAndMethod method -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
@@ -34161,13 +33983,13 @@
     3:3:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder addMethodCausingFailure(com.android.tools.r8.graph.DexEncodedMethod):178:178 -> a
     4:4:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder setState(com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):183:183 -> a
     5:5:com.android.tools.r8.graph.LookupResult$LookupResultSuccess build():188:188 -> a
-com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.cD:
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.VC:
     void accept(java.util.function.Consumer,java.util.function.Consumer) -> a
     com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> j
     boolean isMethodTarget() -> m
     boolean isLambdaTarget() -> n
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> o
-com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.YD:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.RD:
     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
@@ -34209,9 +34031,9 @@
     2:2:void <init>(int):57:57 -> a
     2:2:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):95 -> a
     3:3:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):228:228 -> a
-    4:4:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2856:2856 -> a
+    4:4:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2854:2854 -> a
     4:4:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):228 -> a
-    5:5:boolean com.android.tools.r8.graph.DexItemFactory.isClassConstructor(com.android.tools.r8.graph.DexMethod):2860:2860 -> a
+    5:5:boolean com.android.tools.r8.graph.DexItemFactory.isClassConstructor(com.android.tools.r8.graph.DexMethod):2858:2858 -> a
     5:5:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):228 -> a
     6:6:void setConstructor():224:224 -> a
     6:6:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):229 -> a
@@ -34287,7 +34109,7 @@
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():373:374 -> g
     1:2: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.qE:
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.jE:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -34313,7 +34135,7 @@
     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$Builder -> com.android.tools.r8.internal.mE:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.fE:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -34365,13 +34187,13 @@
     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.nE:
+com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.gE:
     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.oE:
+com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.hE:
     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.pE:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.iE:
     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
@@ -35101,11 +34923,11 @@
     1:2:com.android.tools.r8.graph.ProgramMethod getResolvedProgramMethod():213:214 -> o
     boolean isSingleResolution() -> q
     1:1:boolean isVirtualTarget():261:261 -> r
-com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.nG:
+com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.gG:
     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):23:24 -> 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.xG:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.nG:
     com.android.tools.r8.graph.DexType nestHost -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
@@ -35116,7 +34938,7 @@
     3:3:com.android.tools.r8.graph.DexType getNestHost():26:26 -> a
     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 -> n
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.yG:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.oG:
     com.android.tools.r8.graph.DexType nestMember -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
@@ -35193,10 +35015,10 @@
     31:31:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):179 -> b
     32:35:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):179:182 -> b
     36:38:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):181:183 -> b
+    1:6:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):238:243 -> c
     1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):153:153 -> d
-    2:7:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):238:243 -> d
-    8:8:com.android.tools.r8.graph.DexField internalGetNextFieldSignature(com.android.tools.r8.graph.DexField):252:252 -> d
-    9:9:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):307:307 -> d
+    2:2:com.android.tools.r8.graph.DexField internalGetNextFieldSignature(com.android.tools.r8.graph.DexField):252:252 -> d
+    3:3:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):307:307 -> d
     1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):257:257 -> e
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> e
     2:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):257 -> e
@@ -35209,7 +35031,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):262:262 -> f
     1:1:boolean isContextFreeForMethods():302:302 -> g
-    boolean isLegitimateToHaveEmptyMappings() -> m
+    boolean isLegitimateToHaveEmptyMappings() -> n
     1:19:java.lang.String toString():313:331 -> toString
 com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.graph.b3:
     java.util.Map classesWithAllocationSiteTracking -> a
@@ -35357,7 +35179,7 @@
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):298:300 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):293:293 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):293:293 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.kK:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.aK:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lensCodeRewriter -> e
     boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> b
@@ -35433,12 +35255,12 @@
     1:1:java.util.Collection getStrings():306:306 -> m
     1:1:java.util.Collection getTypes():294:294 -> n
     1:1:boolean hasJumboStrings():318:318 -> o
-com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.iK:
+com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.YJ:
     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):121:121 -> <init>
     1:1:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):125:125 -> a
     2:4:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):130:130 -> a
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.jK:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.ZJ:
     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):214:214 -> <init>
@@ -35464,7 +35286,7 @@
     23:23: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):59:59 -> a
     23:23:int getDepth(com.android.tools.r8.graph.DexProgramClass):237 -> a
     24:27:int getDepth(com.android.tools.r8.graph.DexProgramClass):238:241 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.tK:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.jK:
     com.android.tools.r8.graph.DexProto[] protos -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
     boolean $assertionsDisabled -> i
@@ -35558,9 +35380,9 @@
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():55:55 -> n0
     1:7:com.android.tools.r8.graph.ParameterAnnotationsList withFakeThisParameter():210:216 -> o0
     1:1:int size():153:153 -> size
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.KL:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.AL:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.LM:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.BM:
     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>
@@ -35577,7 +35399,7 @@
     27:28:void accept(com.android.tools.r8.graph.DexClass):61:62 -> a
     29:30: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.NM:
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.DM:
     com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext) -> a
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> a
     1:1:com.android.tools.r8.graph.DexClass getContextClass():11:11 -> a
@@ -35589,9 +35411,9 @@
     com.android.tools.r8.graph.ProgramDefinition asProgramDefinition() -> e
     boolean isProgramDefinition() -> f
     1:1:void clearAllAnnotations():38:38 -> z
-com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.OM:
+com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.EM:
     1:1:boolean isProgramContext():12:12 -> B
-com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.PM:
+com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.FM:
     com.android.tools.r8.graph.DexWritableCode code -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
     1:3:void <init>(com.android.tools.r8.graph.DexWritableCode,com.android.tools.r8.graph.ProgramMethod):12:14 -> <init>
@@ -35612,7 +35434,7 @@
     1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinInfo():74:74 -> d0
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():10 -> d0
     1:1:com.android.tools.r8.graph.DexClass getHolder():10:10 -> q
-com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.SM:
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.IM:
     com.android.tools.r8.graph.DexProgramClass getHolder() -> b
     com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> d0
     com.android.tools.r8.graph.DexEncodedMember getDefinition() -> i
@@ -35673,8 +35495,8 @@
     35:35:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):149:149 -> e
     35:35:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):110 -> e
     1:1:com.android.tools.r8.graph.DexClass getHolder():22:22 -> q
-com.android.tools.r8.graph.ProgramOrClasspathClass -> com.android.tools.r8.internal.YM:
-com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.ZM:
+com.android.tools.r8.graph.ProgramOrClasspathClass -> com.android.tools.r8.internal.OM:
+com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.PM:
     java.util.Set classes -> c
     java.lang.String packageDescriptor -> b
     boolean $assertionsDisabled -> d
@@ -35702,11 +35524,11 @@
     2:2:java.lang.String com.android.tools.r8.graph.ProgramPackage.getPackageName():52:52 -> toString
     2:2:java.lang.String toString():78 -> toString
     3:3:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.aN:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.QM:
     java.util.Map packages -> b
     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.CP:
+com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.sP:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -35733,7 +35555,7 @@
     1:1:boolean hasRemovedMethods():95:95 -> k
     1:4:boolean isEmpty():48:51 -> l
     1:1:com.android.tools.r8.graph.PrunedItems$Builder toBuilder():40:40 -> m
-com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.BP:
+com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.rP:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -35753,7 +35575,7 @@
     9:9:com.android.tools.r8.graph.PrunedItems build():180:180 -> a
     1:1:com.android.tools.r8.graph.PrunedItems$Builder setRemovedClasses(java.util.Set):170:170 -> b
     1:1:com.android.tools.r8.graph.PrunedItems$Builder setRemovedMethods(java.util.Set):175:175 -> c
-com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer -> com.android.tools.r8.internal.HT:
+com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer -> com.android.tools.r8.internal.xT:
     com.android.tools.r8.graph.proto.RewrittenPrototypeDescription prototypeChanges -> a
     1:1:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer.<init>():18:18 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):29 -> <init>
@@ -35795,10 +35617,10 @@
     32:32:int fixupReturnedArgumentIndex(int):129:129 -> a
     33:33:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer.getArgumentInfoCollection():34:34 -> a
     33:33:int fixupReturnedArgumentIndex(int):132 -> a
-    34:34:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    34:34:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     34:34:int fixupReturnedArgumentIndex(int):132 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    35:35:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     35:35:int fixupReturnedArgumentIndex(int):132 -> a
     36:36:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer.getArgumentInfoCollection():34:34 -> a
     36:36:int fixupReturnedArgumentIndex(int):134 -> a
@@ -35813,20 +35635,20 @@
     1:1:java.util.BitSet fixupNonNullParamOnNormalExits(java.util.BitSet):111:111 -> b
     1:1:java.util.BitSet fixupNonNullParamOrThrow(java.util.BitSet):120:120 -> c
     1:1:java.util.BitSet fixupUnusedArguments(java.util.BitSet):158:158 -> d
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.eV:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.UU:
     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
     11:17:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):27:33 -> a
     18:18:java.lang.String getFileEnding():40:40 -> a
-    void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> b
+    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
-    4:6:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):71:73 -> 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.nV:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.dV:
     1:1:void <init>(java.lang.String):12:12 -> <init>
     1:1:int lambda$new$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):12:12 -> a
     1:1:java.util.Set lambda$new$1():12:12 -> d
-com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.oV:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.eV:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -35911,17 +35733,17 @@
     1:5:boolean equals(java.lang.Object):266:270 -> equals
     1:1:int hashCode():261:261 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":552,"2":553,"3":554}}
-    552:552:java.lang.String toString():275:275 -> toString
-    553:553:java.lang.String toString():275:275 -> toString
-    554:554:java.lang.String toString():275:275 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":278,"2":279,"3":280}}
+    278:278:java.lang.String toString():275:275 -> toString
+    279:279:java.lang.String toString():275:275 -> toString
+    280:280:java.lang.String toString():275:275 -> toString
     276:276:java.lang.String toString():275:275 -> toString
     277:277:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":555,"2":556,"3":557}}
-    555:555:java.lang.String toString():275:275 -> toString
-    556:556:java.lang.String toString():275:275 -> toString
-    557:557:java.lang.String toString():275:275 -> toString
-com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.sX:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":278,"2":279,"3":280}}
+    278:278:java.lang.String toString():275:275 -> toString
+    279:279:java.lang.String toString():275:275 -> toString
+    280:280:java.lang.String toString():275:275 -> toString
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.iX:
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getResolvedMember() -> b
     com.android.tools.r8.graph.DexClassAndMember getResolutionPair() -> c
@@ -35969,12 +35791,11 @@
     com.android.tools.r8.graph.DexString getHighestSortingString() -> u
     boolean isDexWritableCode() -> v0
     com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> w
-    boolean isSharedCodeObject() -> y0
+    boolean isSharedCodeObject() -> x0
 com.android.tools.r8.graph.ThrowNullCode -> com.android.tools.r8.graph.j3:
     com.android.tools.r8.graph.ThrowNullCode INSTANCE -> d
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:void <init>():38:38 -> <init>
-    1:1:com.android.tools.r8.graph.ThrowNullCode get():41:41 -> A0
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> O
     com.android.tools.r8.graph.Code asCode() -> R
     int getOutgoingRegisterSize() -> U
@@ -36017,7 +35838,8 @@
     com.android.tools.r8.graph.DexString getHighestSortingString() -> u
     boolean isDexWritableCode() -> v0
     com.android.tools.r8.graph.DexDebugInfoForWriting getDebugInfoForWriting() -> w
-    boolean isSharedCodeObject() -> y0
+    boolean isSharedCodeObject() -> x0
+    1:1:com.android.tools.r8.graph.ThrowNullCode get():41:41 -> z0
 com.android.tools.r8.graph.ThrowNullCode$ThrowNullSourceCode -> com.android.tools.r8.graph.i3:
     1:6:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):275:280 -> <init>
     7:7:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):274:274 -> <init>
@@ -36026,7 +35848,7 @@
     2:2:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):284 -> d
     1:1:void lambda$getInstructionBuilders$1(com.android.tools.r8.ir.conversion.IRBuilder):284:284 -> e
     1:1:java.util.List getInstructionBuilders():284:284 -> f
-com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.jY:
+com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.ZX:
     com.android.tools.r8.graph.ThrowingInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -36045,7 +35867,7 @@
     31:31:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):21:21 -> a
     24:24: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.DY:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.tY:
     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:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:61 -> a
@@ -36176,7 +35998,7 @@
     133:133:java.util.List fixupInnerClassAttributes(java.util.List):214 -> a
     134:145:java.util.List fixupInnerClassAttributes(java.util.List):215:226 -> a
     146:153:java.util.List fixupInnerClassAttributes(java.util.List):225:232 -> a
-    154:154:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():614:614 -> a
+    154:154:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():613:613 -> a
     154:154:java.util.List fixupInnerClassAttributes(java.util.List):232 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     155:161:java.util.List fixupInnerClassAttributes(java.util.List):232:238 -> a
@@ -36233,10 +36055,10 @@
     54:57:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):176:179 -> a
     58:67:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):164:173 -> a
     68:69:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):215:216 -> a
-    70:70:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> a
+    70:70:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> a
     70:70:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):216 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    71:71:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> a
+    71:71:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> a
     71:71:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):216 -> a
     72:96:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):219:243 -> a
     97:97:void registerCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite,int,int):239:239 -> a
@@ -36250,10 +36072,10 @@
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():35:35 -> b
     1:1:void registerCallSiteExceptBootstrapArgs(com.android.tools.r8.graph.DexCallSite):202 -> b
     2:2:void registerCallSiteExceptBootstrapArgs(com.android.tools.r8.graph.DexCallSite):202:202 -> b
-    3:3:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> b
+    3:3:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> b
     3:3:void registerCallSiteExceptBootstrapArgs(com.android.tools.r8.graph.DexCallSite):202 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> b
+    4:4:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> b
     4:4:void registerCallSiteExceptBootstrapArgs(com.android.tools.r8.graph.DexCallSite):202 -> b
     5:11:void registerCallSiteExceptBootstrapArgs(com.android.tools.r8.graph.DexCallSite):205:211 -> b
     12:13:void doBreak():39:40 -> b
@@ -36287,12 +36109,12 @@
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):133:133 -> h
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.Z00:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.P00:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> c
     1:2:void <clinit>():21:22 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
-com.android.tools.r8.graph.UseRegistryWithResult -> com.android.tools.r8.internal.a10:
+com.android.tools.r8.graph.UseRegistryWithResult -> com.android.tools.r8.internal.Q00:
     java.lang.Object result -> e
     1:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.Definition,java.lang.Object):0:17 -> <init>
     1:1:java.lang.Object getResult():21:21 -> f
@@ -36317,7 +36139,7 @@
     24:24:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiLevelCompute.computeApiLevelForDefinition(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.androidapi.ComputedApiLevel):44:44 -> a
     24:24:void computeAndSetApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):93 -> a
     25:25:void computeAndSetApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):92:92 -> a
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.V9:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.U9:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     com.android.tools.r8.graph.DexString kotlinAssertionsEnabled -> c
     java.util.List r8InstructionSequence -> f
@@ -36393,7 +36215,7 @@
     84:106:boolean com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis.hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):190:212 -> a
     84:106:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):91 -> a
     107:107:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):92:92 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.fi:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.ai:
     1:1:void <init>():18:18 -> <init>
     void done(com.android.tools.r8.shaking.Enqueuer) -> a
     void notifyFailedMethodResolutionTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
@@ -36406,12 +36228,12 @@
     void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processTracedCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
-com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.mi:
+com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.hi:
     void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> b
-com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.Xl:
+com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.Sl:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
@@ -36427,7 +36249,7 @@
     21:35:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):80 -> a
     36:36:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):81:81 -> a
     void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> b
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.op:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.hp:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):62:62 -> <init>
@@ -36435,7 +36257,7 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):69:85 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):83:83 -> a
     19:19:void done(com.android.tools.r8.shaking.Enqueuer):91:91 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.np:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.gp:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -36443,7 +36265,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):21:21 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):27:29 -> <init>
     1:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):34:51 -> a
-com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround -> com.android.tools.r8.internal.Pu:
+com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround -> com.android.tools.r8.internal.Iu:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.graph.DexType androidHardwareCamera2CameraDeviceType -> a
@@ -36454,17 +36276,17 @@
     3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57:57 -> a
     4:4:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):65:65 -> a
     4:4:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     5:5:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     6:6:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):66 -> a
     6:6:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     7:7:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):67:67 -> a
     7:7:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     8:8:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.i6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.h6:
     java.util.Set isReadForInvokeReceiver -> a
     boolean isReadForWrite -> b
     1:1:void <init>(java.util.Set,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$1):16:16 -> <init>
@@ -36473,7 +36295,7 @@
     1:1:java.util.Set getReadForInvokeReceiver():56:56 -> b
     1:1:boolean isReadForInvokeReceiver():52:52 -> c
     1:1:boolean isReadForWrite():60:60 -> d
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.h6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.g6:
     java.util.Set isReadForInvokeReceiver -> a
     boolean isReadForWrite -> b
     boolean $assertionsDisabled -> c
@@ -36485,7 +36307,7 @@
     5:5:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata build():85 -> a
     6:7:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata build():85:86 -> a
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder setIsReadForWrite():80:80 -> b
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.k6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.j6:
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -36494,7 +36316,7 @@
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder builder(com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):29:29 -> a
     2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata empty():34:34 -> a
     3:3:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(java.lang.Object):38:38 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.j6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.i6:
     java.util.Map backing -> b
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider bytecodeMetadataProvider -> a
     boolean $assertionsDisabled -> c
@@ -36504,7 +36326,7 @@
     1:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):52:55 -> a
     5:5:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata build():61:61 -> a
     6:6:boolean verifyNoMetadata(com.android.tools.r8.ir.code.Instruction):65:65 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.k6:
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider EMPTY -> b
     1:2:void <clinit>():21:22 -> <clinit>
@@ -36512,7 +36334,7 @@
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder builder():31:31 -> a
     2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.ir.code.Instruction):43:43 -> a
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider empty():35:35 -> b
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.l6$a:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.k6$a:
     java.util.Map builders -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():46:46 -> <clinit>
@@ -36520,10 +36342,10 @@
     1:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder addMetadata(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):57:60 -> a
     5:11:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider build():65:71 -> a
     12:12:void lambda$build$0(java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):70:70 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.dE:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.WD:
     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.eE:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.XD:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -36531,7 +36353,7 @@
     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.O10:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.E10:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedInterfaces -> b
     boolean $assertionsDisabled -> c
@@ -36578,103 +36400,83 @@
     1:1:int hashCode():39:39 -> hashCode
 com.android.tools.r8.graph.proto.ArgumentInfoCollection -> com.android.tools.r8.graph.proto.c:
     com.android.tools.r8.graph.proto.ArgumentPermutation argumentPermutation -> c
-    boolean $assertionsDisabled -> g
+    boolean $assertionsDisabled -> f
     int argumentInfosSize -> b
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap EMPTY_MAP -> e
-    com.android.tools.r8.graph.proto.ArgumentInfoCollection EMPTY -> f
+    com.android.tools.r8.graph.proto.ArgumentInfoCollection EMPTY -> e
+    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap EMPTY_MAP -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap argumentInfos -> a
-    boolean isConvertedToStaticMethod -> d
     1:4:void <clinit>():29:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,boolean,com.android.tools.r8.graph.proto.ArgumentInfoCollection$1):29:29 -> <init>
-    2:6:void <init>():40:44 -> <init>
-    7:17:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,boolean):51:61 -> <init>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation,com.android.tools.r8.graph.proto.ArgumentInfoCollection$1):29:29 -> <init>
+    2:5:void <init>():39:42 -> <init>
+    6:14:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,int,com.android.tools.r8.graph.proto.ArgumentPermutation):48:56 -> <init>
     1:1:int access$000(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):29:29 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap access$100():29:29 -> a
-    3:4:void forEach(com.android.tools.r8.utils.IntObjConsumer):69:70 -> a
-    5:12:int getNumberOfRemovedArgumentsBefore(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):129:136 -> a
-    13:13:com.android.tools.r8.graph.proto.ArgumentInfo getArgumentInfo(int):157:157 -> a
-    14:14:int getNewArgumentIndex(int,int):166:166 -> a
-    15:35:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):180:200 -> a
-    36:36:boolean isConvertedToStaticMethod():170:170 -> a
-    36:36:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):201 -> a
-    37:38:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):201:202 -> a
-    39:41:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):187:189 -> a
-    42:43:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):195:196 -> a
-    44:56:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):294:306 -> a
-    57:59:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):357:359 -> a
-    57:59:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):307 -> a
-    60:63:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):309:312 -> a
-    64:66:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):357:359 -> a
-    64:66:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):315 -> a
-    67:78:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):318:329 -> a
-    79:79:boolean isArgumentRemoved(int):98:98 -> a
-    79:79:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):330 -> a
-    80:80:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):333:333 -> a
-    81:81:boolean isArgumentRemoved(int):98:98 -> a
-    81:81:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):334 -> a
-    82:89:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):337:344 -> a
-    90:90:boolean isConvertedToStaticMethod():170:170 -> a
-    90:90:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):344 -> a
-    91:91:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):344:344 -> a
-    92:92:boolean isConvertedToStaticMethod():170:170 -> a
-    92:92:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):345 -> a
-    93:93:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):345:345 -> a
-    94:99:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):344:349 -> a
-    100:100:boolean isConvertedToStaticMethod():170:170 -> a
-    100:100:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):351 -> a
-    101:103:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):350:352 -> a
-    104:104:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):377:377 -> a
-    105:105:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):377:377 -> a
-    1:1:int getNumberOfRemovedArgumentsBefore(int):123:123 -> b
-    1:1:int getNewArgumentIndex(int):161 -> b
-    2:2:int getNewArgumentIndex(int):161:161 -> b
-    3:3:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder builder():229:229 -> b
-    1:1:com.android.tools.r8.graph.proto.ArgumentInfoCollection empty():65:65 -> c
-    2:2:boolean hasArgumentInfo(int):149:149 -> c
-    1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():79:83 -> d
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet getKeys():75:75 -> d
-    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():84 -> d
-    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():86:86 -> d
-    8:8:java.util.Iterator iterator():106:106 -> d
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():87 -> d
-    9:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():88:91 -> d
-    1:1:boolean hasArgumentPermutation():153:153 -> e
+    3:4:void forEach(com.android.tools.r8.utils.IntObjConsumer):64:65 -> a
+    5:12:int getNumberOfRemovedArgumentsBefore(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap):124:131 -> a
+    13:13:com.android.tools.r8.graph.proto.ArgumentInfo getArgumentInfo(int):152:152 -> a
+    14:14:int getNewArgumentIndex(int,int):161:161 -> a
+    15:34:com.android.tools.r8.graph.proto.ArgumentInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):171:190 -> a
+    35:37:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):178:180 -> a
+    38:39:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder,int,com.android.tools.r8.graph.proto.ArgumentInfo):186:187 -> a
+    40:52:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):268:280 -> a
+    53:55:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):326:328 -> a
+    53:55:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):281 -> a
+    56:59:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):283:286 -> a
+    60:62:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry peekNext(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):326:328 -> a
+    60:62:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):289 -> a
+    63:74:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):292:303 -> a
+    75:75:boolean isArgumentRemoved(int):93:93 -> a
+    75:75:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):304 -> a
+    76:76:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):307:307 -> a
+    77:77:boolean isArgumentRemoved(int):93:93 -> a
+    77:77:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):308 -> a
+    78:88:com.android.tools.r8.graph.proto.ArgumentInfoCollection combine(com.android.tools.r8.graph.proto.ArgumentInfoCollection):311:321 -> a
+    89:89:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):346:346 -> a
+    90:90:void lambda$createParameterAnnotationsRemover$2(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):346:346 -> a
+    1:1:int getNumberOfRemovedArgumentsBefore(int):118:118 -> b
+    1:1:int getNewArgumentIndex(int):156 -> b
+    2:2:int getNewArgumentIndex(int):156:156 -> b
+    3:3:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder builder():215:215 -> b
+    1:1:com.android.tools.r8.graph.proto.ArgumentInfoCollection empty():60:60 -> c
+    2:2:boolean hasArgumentInfo(int):144:144 -> c
+    1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():74:78 -> d
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet getKeys():70:70 -> d
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():79 -> d
+    7:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():81:81 -> d
+    8:8:java.util.Iterator iterator():101:101 -> d
+    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():82 -> d
+    9:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection getRemovedParameterIndices():83:86 -> d
+    1:1:boolean hasArgumentPermutation():148:148 -> e
     2:2:boolean com.android.tools.r8.graph.proto.ArgumentPermutation.isDefault():0:0 -> e
-    2:2:boolean hasArgumentPermutation():153 -> e
-    1:6:boolean equals(java.lang.Object):212:217 -> equals
-    1:2:boolean hasRemovedArguments():110:111 -> f
-    1:1:boolean isConvertedToStaticMethod():170:170 -> g
-    1:1:boolean isEmpty():102:102 -> h
-    1:3:int hashCode():224:224 -> hashCode
-    1:1:int numberOfRemovedArguments():119:119 -> i
-    1:2:int size():174:175 -> j
+    2:2:boolean hasArgumentPermutation():148 -> e
+    1:6:boolean equals(java.lang.Object):200:205 -> equals
+    1:2:boolean hasRemovedArguments():105:106 -> f
+    1:1:boolean isEmpty():97:97 -> g
+    1:1:int numberOfRemovedArguments():114:114 -> h
+    1:1:int hashCode():211:211 -> hashCode
+    1:2:int size():165:166 -> i
 com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder -> com.android.tools.r8.graph.proto.c$a:
     com.android.tools.r8.graph.proto.ArgumentPermutation argumentPermutation -> c
     int argumentInfosSize -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap argumentInfos -> a
-    boolean isConvertedToStaticMethod -> d
-    1:5:void <init>():232:236 -> <init>
-    1:1:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder addArgumentInfo(int,com.android.tools.r8.graph.proto.ArgumentInfo):240:240 -> a
-    2:2:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder addArgumentInfos(com.android.tools.r8.graph.proto.ArgumentInfoCollection):245:245 -> a
-    3:3:int getNumberOfRemovedArgumentsBefore(int):250:250 -> a
-    4:4:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setArgumentPermutation(com.android.tools.r8.graph.proto.ArgumentPermutation):269:269 -> a
-    5:5:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setIsConvertedToStaticMethod(boolean):278:278 -> a
-    6:11:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():283:288 -> a
-    1:1:boolean hasArgumentInfo(int):254:254 -> b
-    2:3:boolean isEmpty():258:259 -> b
-    4:4:boolean com.android.tools.r8.graph.proto.ArgumentPermutation.isDefault():0:0 -> b
-    4:4:boolean isEmpty():259 -> b
-    5:5:boolean isEmpty():259:259 -> b
-    1:1:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setArgumentInfosSize(int):264:264 -> c
-    2:2:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setIsConvertedToStaticMethod(boolean):278:278 -> c
-    2:2:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setIsConvertedToStaticMethod():274 -> c
-com.android.tools.r8.graph.proto.ArgumentPermutation -> com.android.tools.r8.internal.K2:
+    1:5:void <init>():218:222 -> <init>
+    1:1:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder addArgumentInfo(int,com.android.tools.r8.graph.proto.ArgumentInfo):225:225 -> a
+    2:2:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder addArgumentInfos(com.android.tools.r8.graph.proto.ArgumentInfoCollection):230:230 -> a
+    3:3:int getNumberOfRemovedArgumentsBefore(int):235:235 -> a
+    4:4:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setArgumentPermutation(com.android.tools.r8.graph.proto.ArgumentPermutation):252:252 -> a
+    5:10:com.android.tools.r8.graph.proto.ArgumentInfoCollection build():257:262 -> a
+    1:1:boolean hasArgumentInfo(int):239:239 -> b
+    2:2:boolean isEmpty():243:243 -> b
+    3:3:boolean com.android.tools.r8.graph.proto.ArgumentPermutation.isDefault():0:0 -> b
+    3:3:boolean isEmpty():243 -> b
+    1:1:com.android.tools.r8.graph.proto.ArgumentInfoCollection$Builder setArgumentInfosSize(int):247:247 -> c
+com.android.tools.r8.graph.proto.ArgumentPermutation -> com.android.tools.r8.internal.J2:
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.proto.ArgumentPermutation$Builder builder(int):14:14 -> a
     2:2:com.android.tools.r8.graph.proto.DefaultArgumentPermutation getDefault():18:18 -> a
     int getNewArgumentIndex(int) -> b
     boolean isDefault() -> b
-com.android.tools.r8.graph.proto.ArgumentPermutation$Builder -> com.android.tools.r8.internal.J2:
+com.android.tools.r8.graph.proto.ArgumentPermutation$Builder -> com.android.tools.r8.internal.I2:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap newArgumentIndices -> a
     1:1:void <init>(int,com.android.tools.r8.graph.proto.ArgumentPermutation$1):27:27 -> <init>
     2:5:void <init>(int):31:34 -> <init>
@@ -36684,13 +36486,13 @@
     2:2:com.android.tools.r8.graph.proto.ArgumentPermutation build():52 -> a
     3:3:com.android.tools.r8.graph.proto.ArgumentPermutation build():54:54 -> a
     4:6:com.android.tools.r8.graph.proto.ArgumentPermutation$Builder setNewArgumentIndex(int,int):43:45 -> a
-com.android.tools.r8.graph.proto.ArgumentPermutationMap -> com.android.tools.r8.internal.L2:
+com.android.tools.r8.graph.proto.ArgumentPermutationMap -> com.android.tools.r8.internal.K2:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap newArgumentIndices -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):13:15 -> <init>
     1:1:int getNewArgumentIndex(int):20:20 -> b
-com.android.tools.r8.graph.proto.DefaultArgumentPermutation -> com.android.tools.r8.internal.Me:
+com.android.tools.r8.graph.proto.DefaultArgumentPermutation -> com.android.tools.r8.internal.He:
     com.android.tools.r8.graph.proto.DefaultArgumentPermutation INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
@@ -36743,105 +36545,105 @@
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
     com.android.tools.r8.graph.proto.ArgumentInfoCollection argumentInfoCollection -> b
-    1:3:void <clinit>():33:35 -> <clinit>
-    1:4:void <init>():41:44 -> <init>
-    5:10:void <init>(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):50:55 -> <init>
-    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):62:62 -> a
-    2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription none():73:73 -> a
-    2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):63 -> a
-    3:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):64:64 -> a
-    4:14:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):86:96 -> a
-    15:15:java.util.List getExtraParameters():121:121 -> a
-    15:15:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):97 -> a
-    16:16:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):97:97 -> a
-    17:17:java.util.List getExtraParameters():121:121 -> a
-    17:17:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):98 -> a
-    18:21:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):98:101 -> a
-    22:22:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():148:148 -> a
-    22:22:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):102 -> a
-    23:23:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):102:102 -> a
+    1:3:void <clinit>():34:36 -> <clinit>
+    1:4:void <init>():42:45 -> <init>
+    5:10:void <init>(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):51:56 -> <init>
+    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):63:63 -> a
+    2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription none():74:74 -> a
+    2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):64 -> a
+    3:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription create(java.util.List,com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):65:65 -> a
+    4:14:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):87:97 -> a
+    15:15:java.util.List getExtraParameters():122:122 -> a
+    15:15:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):98 -> a
+    16:16:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):98:98 -> a
+    17:17:java.util.List getExtraParameters():122:122 -> a
+    17:17:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):99 -> a
+    18:21:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):99:102 -> a
+    22:22:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():149:149 -> a
+    22:22:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):103 -> a
+    23:23:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):103:103 -> a
     24:24:com.android.tools.r8.graph.proto.RewrittenTypeInfo com.android.tools.r8.graph.proto.RewrittenTypeInfo.combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):35:35 -> a
-    24:24:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):102 -> a
-    25:25:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():148:148 -> a
-    25:25:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):103 -> a
-    26:27:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():133:133 -> a
-    26:27:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):105 -> a
-    28:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):105:106 -> a
-    30:30:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():133:133 -> a
-    30:30:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):78 -> a
-    31:31:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
-    32:32:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():133:133 -> a
-    33:36:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):165:168 -> a
+    24:24:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):103 -> a
+    25:25:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():149:149 -> a
+    25:25:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):104 -> a
+    26:27:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():134:134 -> a
+    26:27:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):106 -> a
+    28:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription combine(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):106:107 -> a
+    30:30:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():134:134 -> a
+    30:30:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):79 -> a
+    31:31:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):79:79 -> a
+    32:32:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():134:134 -> a
+    33:36:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):166:169 -> a
     37:37: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
-    37:37:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):168 -> a
-    38:38:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):169:169 -> a
-    39:43:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):175:179 -> a
-    44:45:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):184:185 -> a
-    46:50:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):192:196 -> a
-    46:50:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    51:55:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):202:206 -> a
-    51:55:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    51:55:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    56:56:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):144:144 -> a
-    56:56:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):209 -> a
+    37:37:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):169 -> a
+    38:38:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):170:170 -> a
+    39:43:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):176:180 -> a
+    44:45:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):185:186 -> a
+    46:50:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):193:197 -> a
+    46:50:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    51:55:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):203:207 -> a
+    51:55:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    51:55:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    56:56:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):139:139 -> a
+    56:56:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):210 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    56:56:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    56:56:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    57:57:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):145:145 -> a
-    57:57:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):209 -> a
-    57:57:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    57:57:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    58:58:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
-    58:58:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):145 -> a
-    58:58:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):209 -> a
-    58:58:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    58:58:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    59:59:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):145:145 -> a
-    59:59:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):209 -> a
-    59:59:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    59:59:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    60:66:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):209:215 -> a
-    60:66:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    60:66:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
+    56:56:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    56:56:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    57:57:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):140:140 -> a
+    57:57:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):210 -> a
+    57:57:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    57:57:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    58:58:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
+    58:58:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):140 -> a
+    58:58:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):210 -> a
+    58:58:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    58:58:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    59:59:int com.android.tools.r8.graph.proto.ArgumentInfoCollection.numberOfRemovedNonReceiverArguments(com.android.tools.r8.graph.ProgramMethod):140:140 -> a
+    59:59:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):210 -> a
+    59:59:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    59:59:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    60:66:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):210:216 -> a
+    60:66:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    60:66:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
     67:67:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isNone():0:0 -> a
-    67:67:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):215 -> a
-    67:67:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    67:67:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    68:68:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):216:216 -> a
-    68:68:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    68:68:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
+    67:67:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):216 -> a
+    67:67:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    67:67:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    68:68:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):217:217 -> a
+    68:68:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    68:68:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
     69:69:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
-    69:69:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):217 -> a
-    69:69:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    69:69:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    70:76:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):218:224 -> a
-    70:76:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):197 -> a
-    70:76:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    77:77:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198:198 -> a
-    77:77:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    78:78:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188:188 -> a
-    79:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> a
-    79:79:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    69:69:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):218 -> a
+    69:69:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    69:69:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    70:76:com.android.tools.r8.graph.DexType[] rewriteParameters(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):219:225 -> a
+    70:76:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):198 -> a
+    70:76:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    77:77:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):199:199 -> a
+    77:77:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
+    78:78:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):189:189 -> a
+    79:79:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
+    79:79:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):189 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:80:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> a
-    80:80:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):188 -> a
-    81:89:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):231:239 -> a
-    90:93:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription withRewrittenReturnInfo(com.android.tools.r8.graph.proto.RewrittenTypeInfo):247:250 -> a
-    94:101:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription withExtraParameters(java.util.List):260:267 -> a
-    1:1:java.util.List getExtraParameters():121:121 -> b
-    1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():148:148 -> c
-    1:1:boolean hasBeenChangedToReturnVoid():129:129 -> d
-    1:1:boolean hasExtraParameters():117:117 -> e
-    1:7:boolean equals(java.lang.Object):273:279 -> equals
-    1:1:boolean hasRewrittenReturnInfo():137:137 -> f
-    1:3:boolean isEmpty():111:113 -> g
-    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription none():73:73 -> h
-    1:1:int hashCode():284:284 -> hashCode
-    1:1:int numberOfExtraParameters():125:125 -> i
-    1:1:boolean requiresRewritingAtCallSite():141:141 -> j
-    2:2:int numberOfExtraParameters():125:125 -> j
-    2:2:boolean requiresRewritingAtCallSite():142 -> j
-    3:5:boolean requiresRewritingAtCallSite():142:144 -> j
+    80:80:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
+    80:80:com.android.tools.r8.graph.DexMethod rewriteMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):189 -> a
+    81:89:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):232:240 -> a
+    90:93:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription withRewrittenReturnInfo(com.android.tools.r8.graph.proto.RewrittenTypeInfo):248:251 -> a
+    94:101:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription withExtraParameters(java.util.List):267:274 -> a
+    1:1:java.util.List getExtraParameters():122:122 -> b
+    1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo getRewrittenReturnInfo():149:149 -> c
+    1:1:boolean hasBeenChangedToReturnVoid():130:130 -> d
+    1:1:boolean hasExtraParameters():118:118 -> e
+    1:7:boolean equals(java.lang.Object):280:286 -> equals
+    1:1:boolean hasRewrittenReturnInfo():138:138 -> f
+    1:3:boolean isEmpty():112:114 -> g
+    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription none():74:74 -> h
+    1:1:int hashCode():291:291 -> hashCode
+    1:1:int numberOfExtraParameters():126:126 -> i
+    1:1:boolean requiresRewritingAtCallSite():142:142 -> j
+    2:2:int numberOfExtraParameters():126:126 -> j
+    2:2:boolean requiresRewritingAtCallSite():143 -> j
+    3:5:boolean requiresRewritingAtCallSite():143:145 -> j
 com.android.tools.r8.graph.proto.RewrittenTypeInfo -> com.android.tools.r8.graph.proto.h:
     com.android.tools.r8.graph.DexType newType -> d
     com.android.tools.r8.graph.DexType oldType -> c
@@ -36889,7 +36691,7 @@
     4:4:com.android.tools.r8.graph.proto.RewrittenTypeInfo build():160:160 -> a
     1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo$Builder setNewType(com.android.tools.r8.graph.DexType):150:150 -> b
     1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo$Builder setOldType(com.android.tools.r8.graph.DexType):145:145 -> c
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.ma:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.la:
     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
@@ -36959,7 +36761,7 @@
     3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> b
     3:3:boolean lambda$fixAccessFlags$4(com.android.tools.r8.graph.DexEncodedField):125 -> b
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):131:131 -> c
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.ra:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.qa:
     com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> f
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
@@ -36983,20 +36785,20 @@
     4:4:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):111:111 -> a
     5:11:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):118:124 -> a
     5:11:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
-    12:12:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
+    12:12:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> a
     12:12:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):124 -> a
     12:12:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    13:13:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
+    13:13:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> a
     13:13:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):124 -> a
     13:13:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
     14:15:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):125:126 -> a
     14:15:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
-    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):331:331 -> a
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318:318 -> a
     16:16:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):126 -> a
     16:16:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
-    17:17: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):335:335 -> a
-    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):331 -> a
+    17:17: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):322:322 -> a
+    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318 -> a
     17:17:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):126 -> a
     17:17:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
     18:23:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):127:132 -> a
@@ -37004,126 +36806,124 @@
     24:24:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
     24:24:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):133 -> a
     24:24:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
-    25:39:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):133:147 -> a
-    25:39:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
-    40:40:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):146:146 -> a
-    40:40:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
-    41:41:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):113:113 -> a
-    42:46:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):154:158 -> a
-    47:47:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
-    47:47:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):158 -> a
+    25:38:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticClassInitializers(com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):133:146 -> a
+    25:38:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):112 -> a
+    39:39:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):113:113 -> a
+    40:44:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):153:157 -> a
+    45:45:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> a
+    45:45:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):157 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    48:48:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
-    48:48:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):158 -> a
-    49:60:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):156:167 -> a
-    61:61:void lambda$mergeInstanceInitializers$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger):194:194 -> a
-    62:62:void lambda$mergeVirtualMethods$3(java.util.function.Consumer,com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):211:211 -> a
-    63:63:boolean lambda$fixNestMemberAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):263:263 -> a
-    64:64:void lambda$mergeInterfaces$6(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):287:287 -> a
-    65:65:void lambda$mergeInterfaces$7(java.util.function.Consumer):287:287 -> a
-    66:68:void lambda$mergeInterfaces$8(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):290:292 -> a
-    69:69:void lambda$mergeInterfaces$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):298:298 -> a
-    70:76:void mergeInstanceFields(com.android.tools.r8.graph.PrunedItems$Builder):312:318 -> a
-    77:77:void lambda$mergeInstanceFields$10(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexEncodedField):315:315 -> a
-    78:81:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):332:335 -> a
-    82:82:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):304:304 -> a
-    82:82:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    83:83:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():220:220 -> a
-    83:83:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
-    83:83:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    84:84:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
-    84:84:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():220 -> a
+    46:46:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> a
+    46:46:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):157 -> a
+    47:58:void lambda$mergeDirectMethods$1(com.android.tools.r8.graph.ProgramMethod):155:166 -> a
+    59:59:void lambda$mergeInstanceInitializers$2(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger):193:193 -> a
+    60:60:void lambda$mergeVirtualMethods$3(java.util.function.Consumer,com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):210:210 -> a
+    61:61:boolean lambda$fixNestMemberAttributes$5(com.android.tools.r8.graph.NestMemberClassAttribute):262:262 -> a
+    62:62:void lambda$mergeInterfaces$6(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):286:286 -> a
+    63:63:void lambda$mergeInterfaces$7(java.util.function.Consumer):286:286 -> a
+    64:66:void lambda$mergeInterfaces$8(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):289:291 -> a
+    67:67:void lambda$mergeInterfaces$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):297:297 -> a
+    68:74:void mergeInstanceFields(com.android.tools.r8.graph.PrunedItems$Builder):311:317 -> a
+    75:75:void lambda$mergeInstanceFields$10(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexEncodedField):314:314 -> a
+    76:79:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):331:334 -> a
+    80:80:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):303:303 -> a
+    80:80:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):335 -> a
+    81:81:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():219:219 -> a
+    81:81:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):304 -> a
+    81:81:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):335 -> a
+    82:82:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
+    82:82:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    84:84:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
-    84:84:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    85:85:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
-    85:85:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():220 -> a
-    85:85:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
-    85:85:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    86:91:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():220:225 -> a
-    86:91:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
-    86:91:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    92:92:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicFinalSynthetic():80:80 -> a
-    92:92:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():226 -> a
-    92:92:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
-    92:92:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    93:107:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():226:240 -> a
-    93:107:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
-    93:107:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    108:109:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):307:308 -> a
-    108:109:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    110:112:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):202:204 -> a
-    110:112:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):337 -> a
-    113:115:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):341:343 -> a
-    116:116:void lambda$mergeGroup$12(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass):343:343 -> a
-    1:2:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):181:182 -> b
+    82:82:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):304 -> a
+    82:82:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):335 -> a
+    83:83:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
+    83:83:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():219 -> a
+    83:83:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):304 -> a
+    83:83:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):335 -> a
+    84:89:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():219:224 -> a
+    84:89:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):304 -> a
+    84:89:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):335 -> a
+    90:90:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.FieldAccessFlags.createPublicFinalSynthetic():80:80 -> a
+    90:90:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():225 -> a
+    90:90:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):304 -> a
+    90:90:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):335 -> a
+    91:105:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():225:239 -> a
+    91:105:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):304 -> a
+    91:105:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):335 -> a
+    106:107:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):306:307 -> a
+    106:107:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):335 -> a
+    108:110:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):201:203 -> a
+    108:110:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
+    111:113:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):340:342 -> a
+    114:114:void lambda$mergeGroup$12(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass):342:342 -> a
+    1:2:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):180:181 -> 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):183 -> b
+    3:3:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):182 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> b
-    4:4:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):183 -> b
-    5:7:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):183:185 -> b
-    8:8:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):182:182 -> b
-    9:9:void mergeInstanceInitializers(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):192:192 -> b
-    10:17:void mergeVirtualMethods(java.util.function.Consumer):209:216 -> b
-    18:18:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):216:216 -> b
-    19:19:void fixAccessFlags():244:244 -> b
+    4:4:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):182 -> b
+    5:7:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):182:184 -> b
+    8:8:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):181:181 -> b
+    9:9:void mergeInstanceInitializers(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):191:191 -> b
+    10:17:void mergeVirtualMethods(java.util.function.Consumer):208:215 -> b
+    18:18:void lambda$mergeVirtualMethods$4(com.android.tools.r8.graph.DexProgramClass):215:215 -> b
+    19:19:void fixAccessFlags():243:243 -> b
     20:20:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
-    20:20:void fixAccessFlags():244 -> b
-    21:23:void fixAccessFlags():245:247 -> b
+    20:20:void fixAccessFlags():243 -> b
+    21:23:void fixAccessFlags():244:246 -> b
     24:24:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
-    24:24:void fixAccessFlags():247 -> b
-    25:25:void fixAccessFlags():248:248 -> b
-    26:28:void lambda$mergeInstanceFields$11(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass):314:316 -> b
-    1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):152:152 -> c
+    24:24:void fixAccessFlags():246 -> b
+    25:25:void fixAccessFlags():247:247 -> b
+    26:28:void lambda$mergeInstanceFields$11(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass):313:315 -> b
+    1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):151:151 -> c
     2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):256:256 -> c
-    2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):152 -> c
+    2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):151 -> c
     3:3:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):256:256 -> c
-    3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):152 -> c
+    3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):151 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):172:172 -> c
-    5:13:void fixNestMemberAttributes():253:261 -> c
-    1:4:void mergeAnnotations():271:274 -> d
+    4:4:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):171:171 -> c
+    5:13:void fixNestMemberAttributes():252:260 -> c
+    1:4:void mergeAnnotations():270:273 -> d
     1:1:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():305:305 -> e
-    1:1:void mergeInterfaces():281 -> e
-    2:20:void mergeInterfaces():282:300 -> e
+    1:1:void mergeInterfaces():280 -> e
+    2:20:void mergeInterfaces():281:299 -> e
     21:21:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(java.util.Collection):55:55 -> e
-    21:21:void mergeInterfaces():300 -> e
+    21:21:void mergeInterfaces():299 -> e
     22:22:void com.android.tools.r8.graph.DexTypeList.<init>(java.util.Collection):47:47 -> e
     22:22:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(java.util.Collection):55 -> e
-    22:22:void mergeInterfaces():300 -> e
+    22:22:void mergeInterfaces():299 -> e
     23:23:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):189:189 -> e
-    23:23:void mergeInterfaces():300 -> e
+    23:23:void mergeInterfaces():299 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:3:void mergeStaticFields():322:324 -> f
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.qa:
+    1:3:void mergeStaticFields():321:323 -> f
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.pa:
     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>():346:346 -> <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):356:360 -> <init>
-    1:15:java.util.List createVirtualMethodMergers():364:378 -> a
-    16:16:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):368:368 -> a
+    1:1:void <clinit>():345:345 -> <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):355:359 -> <init>
+    1:15:java.util.List createVirtualMethodMergers():363:377 -> a
+    16:16:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):367:367 -> a
     17:17:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
-    17:17:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):368 -> a
+    17:17:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):367 -> a
     18:18:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> a
-    18:18:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):368 -> a
+    18:18:void lambda$createVirtualMethodMergers$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):367 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):372:372 -> a
-    20:23:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):371:374 -> a
-    24:24:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$createVirtualMethodMergers$0(com.android.tools.r8.graph.DexMethodSignature):373:373 -> a
-    25:31:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):393:399 -> a
-    32:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():385:388 -> a
-    32:35:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):400 -> a
-    36:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():387:387 -> a
-    36:36:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):400 -> a
-    37:37:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():386:386 -> a
-    37:37:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):400 -> a
-    38:38:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):403:403 -> a
-    39:39:boolean lambda$build$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):397:397 -> a
-com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.sa:
+    19:19:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):371:371 -> a
+    20:23:void lambda$createVirtualMethodMergers$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):370:373 -> a
+    24:24:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$createVirtualMethodMergers$0(com.android.tools.r8.graph.DexMethodSignature):372:372 -> a
+    25:31:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):392:398 -> a
+    32:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():384:387 -> a
+    32:35:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):399 -> a
+    36:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():386:386 -> a
+    36:36:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):399 -> a
+    37:37:void com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createClassIdField():385:385 -> a
+    37:37:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):399 -> a
+    38:38:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):402:402 -> a
+    39:39:boolean lambda$build$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):396:396 -> a
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.ra:
     java.util.List virtualMethods -> b
     java.util.List directMethods -> c
     java.util.Set reservedMethods -> a
@@ -37136,7 +36936,7 @@
     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.Ra:
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.Qa:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
@@ -37152,7 +36952,7 @@
     20:22:void addField(com.android.tools.r8.graph.DexEncodedField):56:58 -> a
     23:23:void addFields(com.android.tools.r8.graph.DexProgramClass):62:62 -> a
     24:24:void merge():66:66 -> a
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.Pd:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.Od:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexField classIdField -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> m
@@ -37185,7 +36985,7 @@
     2:2:boolean com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint.hasClassIdField():53:53 -> k
     2:2:void prepareSingleConstructorInstructions():126 -> k
     3:6:void prepareSingleConstructorInstructions():127:130 -> k
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Qm:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Lm:
     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
@@ -37194,55 +36994,54 @@
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):54:57 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger createForFinalClassMerging(com.android.tools.r8.graph.AppView):67:67 -> a
     2:16:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):89:103 -> a
-    17:19:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):274:276 -> a
+    17:19:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):275:277 -> a
     17:19:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):107 -> a
     20:20:boolean com.android.tools.r8.horizontalclassmerging.MergeGroup.isNonTrivial():202:202 -> a
-    20:20:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):276 -> a
+    20:20:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):277 -> a
     20:20:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    21:25:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):276:280 -> a
+    21:25:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):277:281 -> a
     21:25:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):107 -> a
-    26:26:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):279:279 -> a
+    26:26:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,java.util.Collection):280:280 -> a
     26:26:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):107 -> a
     27:33:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):109:115 -> a
-    34:42:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.applyClassMergers(java.util.Collection,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):291:299 -> a
+    34:42:com.android.tools.r8.graph.PrunedItems com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.applyClassMergers(java.util.Collection,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):292:300 -> a
     34:42:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):116 -> a
-    43:48:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):123:128 -> a
-    49:49:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.builder():28:28 -> a
-    49:49:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    50:53:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128:131 -> a
-    54:55:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createLens(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):311:312 -> a
-    54:55:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):132 -> a
-    56:60:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):134:138 -> a
-    61:61:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):507:507 -> a
-    61:61:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):138 -> a
-    62:64:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):142:142 -> a
-    65:65:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):734:734 -> a
-    65:65:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):142 -> a
-    66:79:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):144:157 -> a
-    80:83:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):156:159 -> a
-    84:84:void lambda$run$0(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):138:138 -> a
-    85:87:void amendKeepInfo(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.List):165:167 -> a
-    88:95:void lambda$amendKeepInfo$2(java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):170:177 -> a
-    96:109:void lambda$amendKeepInfo$2(java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):173:186 -> a
-    110:110:void lambda$amendKeepInfo$1(com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):183:183 -> a
-    111:126:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier createFieldAccessInfoCollectionModifier(java.util.Collection):193:208 -> a
-    127:127:boolean lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.graph.DexEncodedMethod):200:200 -> a
-    128:128:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):201:201 -> a
-    129:129:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):216:216 -> a
-    130:131:void lambda$transformIncompleteCode$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.horizontalclassmerging.MergeGroup):219:220 -> a
-    132:136:void lambda$transformIncompleteCode$8(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.graph.ProgramMethod):226:230 -> a
-    137:137:void lambda$transformIncompleteCode$8(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.graph.ProgramMethod):229:229 -> a
-    138:145:com.android.tools.r8.graph.DirectMappedDexApplication getNewApplication(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):239:246 -> a
-    146:146:boolean lambda$getNewApplication$10(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.graph.DexProgramClass):245:245 -> a
-    147:159:java.util.List getInitialGroups():250:262 -> a
-    160:160:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):326:326 -> a
-    161:161:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":490,"2":491,"3":492}}
-    490:490:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):326:326 -> a
-    491:491:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):326:326 -> a
-    492:492:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):326:326 -> a
-    488:489:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):327:328 -> a
+    43:51:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):123:131 -> a
+    52:52:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.builder():28:28 -> a
+    52:52:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131 -> a
+    53:56:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):131:134 -> a
+    57:58:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createLens(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):312:313 -> a
+    57:58:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):135 -> a
+    59:63:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):137:141 -> a
+    64:64:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):507:507 -> a
+    64:64:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):141 -> a
+    65:67:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):145:145 -> a
+    68:68:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):734:734 -> a
+    68:68:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):145 -> a
+    69:77:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):149:157 -> a
+    78:81:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):156:159 -> a
+    82:82:void lambda$run$0(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):141:141 -> a
+    83:85:void amendKeepInfo(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.List):165:167 -> a
+    86:93:void lambda$amendKeepInfo$2(java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):170:177 -> a
+    94:107:void lambda$amendKeepInfo$2(java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):173:186 -> a
+    108:108:void lambda$amendKeepInfo$1(com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):183:183 -> a
+    109:124:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier createFieldAccessInfoCollectionModifier(java.util.Collection):193:208 -> a
+    125:125:boolean lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.graph.DexEncodedMethod):200:200 -> a
+    126:126:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):201:201 -> a
+    127:127:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):216:216 -> a
+    128:130:void lambda$transformIncompleteCode$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.horizontalclassmerging.MergeGroup):219:221 -> a
+    131:134:void lambda$transformIncompleteCode$8(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.graph.ProgramMethod):227:230 -> a
+    135:142:com.android.tools.r8.graph.DirectMappedDexApplication getNewApplication(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):240:247 -> a
+    143:143:boolean lambda$getNewApplication$10(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.graph.DexProgramClass):246:246 -> a
+    144:156:java.util.List getInitialGroups():251:263 -> a
+    157:157:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):327:327 -> a
+    158:158:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":488,"2":489,"3":490}}
+    488:488:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):327:327 -> a
+    489:489:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):327:327 -> a
+    490:490:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):327:327 -> a
+    486:487:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):328:329 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger createForInitialClassMerging(com.android.tools.r8.graph.AppView):62:62 -> b
     2:2:void runIfNecessary(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):73:73 -> b
     3:3:void runIfNecessary(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):0:0 -> b
@@ -37253,16 +37052,18 @@
     77:85:void runIfNecessary(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):74:82 -> b
     89:89:boolean lambda$createFieldAccessInfoCollectionModifier$5(com.android.tools.r8.graph.DexEncodedMethod):204:204 -> b
     90:90:void lambda$createFieldAccessInfoCollectionModifier$6(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):205:205 -> b
-    91:98:boolean verifyNoCyclesInInterfaceHierarchies(java.util.Collection):316:323 -> b
-    1:2:boolean lambda$transformIncompleteCode$7(com.android.tools.r8.graph.DexEncodedMethod):222:223 -> c
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode -> com.android.tools.r8.internal.Pm:
+    91:98:boolean verifyNoCyclesInInterfaceHierarchies(java.util.Collection):317:324 -> b
+    1:2:boolean lambda$transformIncompleteCode$7(com.android.tools.r8.graph.DexEncodedMethod):223:224 -> c
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode -> com.android.tools.r8.internal.Km:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode INITIAL -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode FINAL -> c
     1:2:void <clinit>():38:39 -> <clinit>
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
     1:1:boolean isFinal():46:46 -> a
     1:1:boolean isInitial():42:42 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Sm:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerCfCode -> com.android.tools.r8.internal.Mm:
+    1:1:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List):20:20 -> <init>
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Om:
     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>
@@ -37278,7 +37079,7 @@
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> f
     3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):136 -> f
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):54 -> f
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Nm:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newFieldSignatures -> a
     java.util.Map methodExtraParameters -> d
@@ -37316,19 +37117,19 @@
     73:73:void commitPendingUpdates():251:251 -> a
     74:76:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.commitPendingNewMemberSignatureUpdates(com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap):258:260 -> a
     74:76:void commitPendingUpdates():251 -> a
-    77:87:void addExtraParameters(com.android.tools.r8.graph.DexMethod,java.util.List):277:287 -> a
-    88:88:java.util.List lambda$addExtraParameters$2(java.util.List,com.android.tools.r8.graph.DexMethod):280:280 -> a
+    77:87:void addExtraParameters(com.android.tools.r8.graph.DexMethod,java.util.List):276:286 -> a
+    88:88:java.util.List lambda$addExtraParameters$2(java.util.List,com.android.tools.r8.graph.DexMethod):279:279 -> a
     boolean lambda$recordNewFieldSignature$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField) -> b
     1:3:boolean lambda$build$0(com.android.tools.r8.graph.DexMethod):123:123 -> b
     4:4:void mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):168:168 -> b
-    5:5:java.util.List lambda$addExtraParameters$3(java.util.List,com.android.tools.r8.graph.DexMethod):286:286 -> b
+    5:5:java.util.List lambda$addExtraParameters$3(java.util.List,com.android.tools.r8.graph.DexMethod):285:285 -> b
     1:1:void recordNewFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):142:142 -> c
     2:2:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):168:168 -> c
     2:2:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):176 -> c
     2:2:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):172 -> 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):177:177 -> c
     3:3:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):172 -> c
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.Pm:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):14:17 -> a
@@ -37338,7 +37139,7 @@
     7:7:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):181:181 -> a
     7:7:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):19 -> a
     8:8:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):19:19 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.Vm:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.Rm:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -37381,7 +37182,7 @@
     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.Um:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.Qm:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():107:107 -> <clinit>
@@ -37391,115 +37192,47 @@
     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.un:
+com.android.tools.r8.horizontalclassmerging.IRCodeProvider -> com.android.tools.r8.internal.qn:
     com.android.tools.r8.graph.AppView appViewForConversion -> a
-    1:11:void <init>(com.android.tools.r8.graph.AppView):18:28 -> <init>
-    1:3:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod):33:35 -> a
-    4:4:void setGraphLens(com.android.tools.r8.graph.GraphLens):39:39 -> a
-com.android.tools.r8.horizontalclassmerging.IncompleteHorizontalClassMergerCode -> com.android.tools.r8.internal.To:
-    1:1:void <init>():20:20 -> <init>
-    com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens) -> a
-    1:1: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):41:41 -> a
-    2:2:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):66:66 -> a
-    3:3:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):71:71 -> a
-    4:4:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):79:79 -> a
-    1:1:boolean computeEquals(java.lang.Object):46:46 -> h
-    1:1:int computeHashCode():51:51 -> m0
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():56:56 -> q0
-    boolean isHorizontalClassMergerCode() -> w0
-    boolean isIncompleteHorizontalClassMergerCode() -> x0
-com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode -> com.android.tools.r8.internal.Vo:
-    com.android.tools.r8.graph.DexMethod parentConstructor -> j
-    boolean $assertionsDisabled -> l
-    com.android.tools.r8.graph.DexMethod syntheticMethodReference -> g
-    java.util.Map instanceFieldAssignmentsPost -> i
-    com.android.tools.r8.graph.DexMethod originalMethodReference -> f
-    com.android.tools.r8.graph.DexField classIdField -> d
-    int extraNulls -> e
-    java.util.Map instanceFieldAssignmentsPre -> h
-    java.util.List parentConstructorArguments -> k
-    1:1:void <clinit>():45:45 -> <clinit>
-    1:9:void <init>(com.android.tools.r8.graph.DexField,int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):66:74 -> <init>
-    1:31:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):82:112 -> a
-    32:32:void com.android.tools.r8.cf.code.CfInstanceFieldWrite.<init>(com.android.tools.r8.graph.DexField):16:16 -> a
-    32:32:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):112 -> a
-    33:48:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):110:125 -> a
-    49:49:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):410:410 -> a
-    49:49:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):125 -> a
-    50:50:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> a
-    50:50:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):410 -> a
-    50:50:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):125 -> a
-    51:57:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):128:134 -> a
-    58:73:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):130:145 -> a
-    74:86:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):141:153 -> a
-    87:87:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):152:152 -> a
-    88:89:void com.android.tools.r8.utils.IntBox.setMax(int):61:62 -> a
-    88:89:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):154 -> a
-    90:100:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):157:167 -> a
-    101:101:void addCfInstructionsForInstanceFieldAssignments(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,java.util.Map,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):182:182 -> a
-    102:105:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185:188 -> a
-    106:109:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):187:190 -> a
-    110:110:void com.android.tools.r8.cf.code.CfInstanceFieldWrite.<init>(com.android.tools.r8.graph.DexField):16:16 -> a
-    110:110:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):190 -> a
-    111:111:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):189:189 -> a
-    112:112:void com.android.tools.r8.utils.IntBox.setMax(int):61:61 -> a
-    112:112:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):191 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    113:113:void com.android.tools.r8.utils.IntBox.setMax(int):62:62 -> a
-    113:113:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):191 -> a
-    114:117: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):200:203 -> a
-    118:127: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):202:211 -> a
-    128:128:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
-    128:128: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):211 -> a
-    129:130: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):212:213 -> a
-    131:131:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
-    131:131: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):213 -> a
-    132:132: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):212:212 -> a
-    133:133:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleDexItemBasedStringValue():0:0 -> a
-    133:133: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):215 -> a
-    134:137: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):217:220 -> a
-    138:138: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):218:218 -> a
-    139:139:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    139:139: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):222 -> a
-    140:140: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):223:223 -> a
-    141:141:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
-    141:141: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):224 -> a
-    142:148: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):224:230 -> a
-    149:157: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:236 -> a
-    158:158: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):235:235 -> a
-    1:1:java.lang.String toString():243:243 -> toString
-com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode$1 -> com.android.tools.r8.internal.Uo:
-    com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens val$lens -> n
-    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode,com.android.tools.r8.graph.DexType,int,int,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):167:167 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):171:171 -> a
-com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode -> com.android.tools.r8.internal.Xo:
+    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.IncompleteVirtuallyMergedMethodCode -> com.android.tools.r8.internal.Qo:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> e
     com.android.tools.r8.graph.DexMethod superMethod -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> f
     com.android.tools.r8.graph.DexField classIdField -> d
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():43:43 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):54:58 -> <init>
-    1:27:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):89:115 -> a
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):60:64 -> <init>
+    1:27:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):96:122 -> a
     28:28:void com.android.tools.r8.cf.code.CfInstanceFieldRead.<init>(com.android.tools.r8.graph.DexField):17:17 -> a
-    28:28:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):115 -> a
-    29:39:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):115:125 -> a
-    40:55:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):124:139 -> a
-    56:59:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):138:141 -> a
-    60:69:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):140:149 -> a
-    70:77:com.android.tools.r8.cf.code.CfFrame createCfFrameForSwitchCase(com.android.tools.r8.graph.ProgramMethod,int):159:166 -> a
-    78:88:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode.createLocalFrames(com.android.tools.r8.graph.ProgramMethod,int):171:181 -> a
-    78:88:com.android.tools.r8.cf.code.CfFrame createCfFrameForSwitchCase(com.android.tools.r8.graph.ProgramMethod,int):166 -> a
-    89:89:com.android.tools.r8.cf.code.CfFrame createCfFrameForSwitchCase(com.android.tools.r8.graph.ProgramMethod,int):166:166 -> a
-    1:1:java.lang.String toString():187:187 -> toString
-com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode$1 -> com.android.tools.r8.internal.Wo:
-    com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens val$lens -> n
-    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode,com.android.tools.r8.graph.DexType,int,int,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):149:149 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):153:153 -> a
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.Xp:
+    28:28:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):122 -> a
+    29:39:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):122:132 -> a
+    40:55:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):131:146 -> a
+    56:59:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):145:148 -> a
+    60:69:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):147:156 -> a
+    70:77:com.android.tools.r8.cf.code.CfFrame createCfFrameForSwitchCase(com.android.tools.r8.graph.ProgramMethod,int):172:179 -> a
+    78:88:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode.createLocalFrames(com.android.tools.r8.graph.ProgramMethod,int):184:194 -> a
+    78:88:com.android.tools.r8.cf.code.CfFrame createCfFrameForSwitchCase(com.android.tools.r8.graph.ProgramMethod,int):179 -> a
+    89:89:com.android.tools.r8.cf.code.CfFrame createCfFrameForSwitchCase(com.android.tools.r8.graph.ProgramMethod,int):179:179 -> a
+    90:90: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):202:202 -> a
+    91:91:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):227:227 -> a
+    92:92:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):232:232 -> a
+    93:93:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):242:242 -> a
+    1:1:boolean computeEquals(java.lang.Object):207:207 -> h
+    1:1:int computeHashCode():212:212 -> m0
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():217:217 -> q0
+    1:1:java.lang.String toString():237:237 -> toString
+    boolean isHorizontalClassMergingCode() -> w0
+com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode$1 -> com.android.tools.r8.internal.Po:
+    boolean $assertionsDisabled -> n
+    1:1:void <clinit>():156:156 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode,com.android.tools.r8.graph.DexType,int,int,java.util.List):156:156 -> <init>
+    1:4:com.android.tools.r8.graph.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):162:165 -> a
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.Qp:
     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):61:61 -> a
+    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):83:83 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):44 -> a
     2:73:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):45:116 -> a
     74:74:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):410:410 -> a
@@ -37518,17 +37251,57 @@
     235:235:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     235:235: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
     236:237: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.Zp:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.Sp:
     java.util.Map instanceFieldAssignmentsPre -> a
     java.util.Map instanceFieldAssignmentsPost -> b
     com.android.tools.r8.graph.DexTypeList relaxedParameters -> e
     java.util.List parentConstructorArguments -> d
+    boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod parentConstructor -> c
-    1:6:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.DexTypeList):51:56 -> <init>
-    1:2:com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode createCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.horizontalclassmerging.MergeGroup,boolean,int):78:79 -> a
-    1:8:boolean equals(java.lang.Object):91:98 -> equals
-    1:1:int hashCode():103:103 -> hashCode
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.Yp:
+    1:1:void <clinit>():46:46 -> <clinit>
+    1:6:void <init>(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.DexTypeList):73:78 -> <init>
+    1:31:com.android.tools.r8.graph.CfCode createCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.horizontalclassmerging.MergeGroup,boolean,int):102:132 -> a
+    32:32:void com.android.tools.r8.cf.code.CfInstanceFieldWrite.<init>(com.android.tools.r8.graph.DexField):16:16 -> a
+    32:32:com.android.tools.r8.graph.CfCode createCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.horizontalclassmerging.MergeGroup,boolean,int):132 -> a
+    33:55:com.android.tools.r8.graph.CfCode createCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.horizontalclassmerging.MergeGroup,boolean,int):132:154 -> a
+    56:65:com.android.tools.r8.graph.CfCode createCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.horizontalclassmerging.MergeGroup,boolean,int):150:159 -> a
+    66:67:void com.android.tools.r8.utils.IntBox.setMax(int):61:62 -> a
+    66:67:com.android.tools.r8.graph.CfCode createCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.horizontalclassmerging.MergeGroup,boolean,int):160 -> a
+    68:75:com.android.tools.r8.graph.CfCode createCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.horizontalclassmerging.MergeGroup,boolean,int):163:170 -> a
+    76:76:void addCfInstructionsForInstanceFieldAssignments(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,java.util.Map,int[],com.android.tools.r8.utils.IntBox):178:178 -> a
+    77:80:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):181:184 -> a
+    81:83:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):183:185 -> a
+    84:84:void com.android.tools.r8.cf.code.CfInstanceFieldWrite.<init>(com.android.tools.r8.graph.DexField):16:16 -> a
+    84:84:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185 -> a
+    85:85:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):185:185 -> a
+    86:86:void com.android.tools.r8.utils.IntBox.setMax(int):61:61 -> a
+    86:86:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):186 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    87:87:void com.android.tools.r8.utils.IntBox.setMax(int):62:62 -> a
+    87:87:void lambda$addCfInstructionsForInstanceFieldAssignments$0(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,int[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):186 -> a
+    88:91: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):195:198 -> a
+    92:101: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):197:206 -> a
+    102:102:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> a
+    102:102: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):206 -> a
+    103:104: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):207:208 -> a
+    105:105:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
+    105:105: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):208 -> a
+    106:106: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):207:207 -> a
+    107:107:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleDexItemBasedStringValue():0:0 -> a
+    107:107: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):210 -> a
+    108:111: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):212:215 -> a
+    112:112: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):213:213 -> a
+    113:113:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    113:113: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):217 -> a
+    114:114: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):218:218 -> a
+    115:115:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
+    115:115: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):219 -> a
+    116:122: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):219:225 -> a
+    123:131: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):223:231 -> a
+    132:132: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):230:230 -> a
+    1:8:boolean equals(java.lang.Object):238:245 -> equals
+    1:1:int hashCode():250:250 -> hashCode
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.Rp:
     java.util.Map instanceFieldAssignmentsPre -> c
     java.util.Map instanceFieldAssignmentsPost -> d
     java.util.List parentConstructorArguments -> f
@@ -37536,15 +37309,15 @@
     com.android.tools.r8.graph.DexMethod parentConstructor -> e
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
-    1:1:void <clinit>():111:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):123:123 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):116:128 -> <init>
-    1:1:com.android.tools.r8.graph.DexType lambda$new$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):129:129 -> a
-    2:20:void addInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):133:151 -> a
-    21:23:boolean addInvokeConstructor(com.android.tools.r8.graph.DexMethod,java.util.List):156:158 -> a
-    24:25:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription build():165:166 -> a
-    1:1:boolean isValid():175:175 -> b
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.dq:
+    1:1:void <clinit>():258:258 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):270:270 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ProgramMethod):263:275 -> <init>
+    1:1:com.android.tools.r8.graph.DexType lambda$new$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):276:276 -> a
+    2:20:void addInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):280:298 -> a
+    21:23:boolean addInvokeConstructor(com.android.tools.r8.graph.DexMethod,java.util.List):303:305 -> a
+    24:25:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription build():312:313 -> a
+    1:1:boolean isValid():322:322 -> b
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.Wp:
     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
@@ -37554,108 +37327,111 @@
     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>():39:39 -> <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):67:80 -> <init>
-    1:1:int getArity():85:85 -> a
-    2:11:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):109:118 -> a
-    12:22:com.android.tools.r8.graph.DexMethod getNewMethodReference(com.android.tools.r8.graph.ProgramMethod,boolean):116:126 -> a
-    23:23:com.android.tools.r8.graph.DexType lambda$getNewMethodReference$0(int,com.android.tools.r8.graph.ProgramMethod):120:120 -> a
-    24:28:com.android.tools.r8.graph.DexMethod getSyntheticMethodReference(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexMethod):146:146 -> a
-    29:34:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):245:250 -> a
-    35:49:com.android.tools.r8.graph.DexMethod moveInstanceInitializer(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):246:260 -> a
-    50:54:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):303:307 -> a
-    55:55:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():240:240 -> a
-    55:55:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):308 -> a
-    56:65:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):308:317 -> a
-    66:77:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):315:326 -> a
-    78:78:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():240:240 -> a
-    78:78:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):329 -> a
-    79:79:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):330:330 -> a
-    80:82:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):185:187 -> a
-    80:82:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):181 -> a
-    80:82:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):330 -> a
-    83:84:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):176:177 -> a
-    83:84:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):187 -> a
-    83:84:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):181 -> a
-    83:84:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):330 -> a
-    85:85:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():295:295 -> a
-    85:85:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):331 -> a
-    86:87:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):331:332 -> a
-    88:88:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):176:176 -> a
-    88:88:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):332 -> 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.DexType lambda$getNewMethodReference$0(int,com.android.tools.r8.graph.ProgramMethod):121:121 -> a
+    24:28:com.android.tools.r8.graph.DexMethod getSyntheticMethodReference(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):147:147 -> a
+    29:33:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):305:309 -> a
+    34:34:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():241:241 -> a
+    34:34:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):310 -> a
+    35:44:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):310:319 -> a
+    45:52:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):317:324 -> a
+    53:53:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():241:241 -> a
+    53:53:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):327 -> a
+    54:54:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):328:328 -> a
+    55:57:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):185:187 -> a
+    55:57:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):181 -> a
+    55:57:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):328 -> a
+    58:59:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):176:177 -> a
+    58: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):187 -> a
+    58:59:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethods(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):181 -> a
+    58: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:60:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():297:297 -> a
+    60:60:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):329 -> a
+    61:62:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):329:330 -> a
+    63:63:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):176:176 -> a
+    63:63:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):330 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    89:89:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):177:177 -> a
-    89:89:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):332 -> a
-    90:95:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):334:339 -> a
-    96:96:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):192:192 -> a
-    96:96:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):338 -> a
+    64:64:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):177:177 -> a
+    64:64:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):330 -> a
+    65:70:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):332:337 -> a
+    71:71:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.recordNewMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):192:192 -> a
+    71:71:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):336 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    97:97:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):345:345 -> a
-    98:98:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():295:295 -> 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):346 -> a
-    99:112:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):346:359 -> a
-    113:120:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):358:365 -> a
-    121:121:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewAccessFlags():267:267 -> a
+    72:72:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):343:343 -> a
+    73:73:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():297:297 -> a
+    73:73:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):344 -> a
+    74:85:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):344:355 -> a
+    86:86:void com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter.<init>():20:20 -> a
+    86:86:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):355 -> a
+    87:89:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):355:357 -> a
+    90:97: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
+    98:98:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewAccessFlags():268:268 -> 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):364 -> 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):364:364 -> a
+    100:100:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():241:241 -> 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):277 -> 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:101:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131:131 -> a
+    101:101: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
+    101:101:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    102:102:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():135:135 -> a
+    102:102:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131 -> a
+    102:102: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
+    102:102:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    103:103:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131:131 -> a
+    103:103: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
+    103:103:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    104:104:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    104:104:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():131 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    104:104: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
+    104:104:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    105:105: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
+    105:105:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    106:106: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:278 -> a
+    106:106:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    107:107:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():297:297 -> a
+    107:107: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):286 -> a
+    107:107:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    108:108: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):286:286 -> a
+    108:108:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    109:109:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():135:135 -> a
+    109: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):287 -> a
+    109: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:112: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
+    110:112:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    113:113:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155:155 -> a
+    113: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 -> a
+    113: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:114:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():241:241 -> a
+    114:114:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155 -> a
+    114:114: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:114:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    115:120:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():155:160 -> a
+    115: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
+    115: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.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():158:158 -> 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):290 -> 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:128:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366:372 -> a
-    129:129:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():240:240 -> a
-    129:129: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):276 -> a
-    129:129:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    130:130:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference() -> a
-    130:130: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 -> 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):368 -> a
-    131:131:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():134:134 -> a
-    131:131:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():130 -> a
-    131:131: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 -> a
-    131:131:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    132:132:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():130:130 -> a
-    132:132: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 -> a
-    132:132:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    133:133:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    133:133:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getOriginalMethodReference():130 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    133:133: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 -> a
-    133:133:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    134:134: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:278 -> a
-    134:134:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    135:135: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:277 -> a
-    135:135:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    136:136:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.isSingleton():295:295 -> a
-    136:136: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):284 -> a
-    136:136:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    137:137: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):284:284 -> a
-    137:137:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    138:138:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getRepresentative():134:134 -> a
-    138:138: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):285 -> a
-    138:138:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    139:141: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):285:287 -> a
-    139:141:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    142:142:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():154:154 -> a
-    142:142: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):288 -> 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):368 -> a
-    143:143:boolean com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.hasInstanceInitializerDescription():240:240 -> a
-    143:143:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():154 -> a
-    143:143: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):288 -> 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):368 -> a
-    144:149:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():154:159 -> a
-    144:149: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):288 -> a
-    144:149:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    150:150:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.createClassIdToInstanceInitializerMap():157:157 -> a
-    150:150: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):288 -> a
-    150:150:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    151:151: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:290 -> a
-    151:151:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):368 -> a
-    152:152:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367:367 -> a
-    153:157:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():94:98 -> a
-    153:157:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):373 -> a
-    158:158:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():97:97 -> a
-    158:158:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):373 -> a
-    159:168:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):373:382 -> a
-    169:174:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):381:386 -> a
-    175:175: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
-    1:1:java.util.List getInstanceInitializers():89:89 -> b
-    1:1:int size():165:165 -> c
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.cq:
+    122:122: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
+    122:122:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):366 -> a
+    123:123: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
+    124:128:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():95:99 -> a
+    124: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:129:com.android.tools.r8.cf.CfVersion com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger.getNewClassFileVersion():98:98 -> a
+    129:129:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):367 -> a
+    130:139: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
+    140:144:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):375: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:int size():166:166 -> c
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.Vp:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> f
     java.util.List instanceInitializerGroups -> d
@@ -37663,24 +37439,24 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> b
     boolean $assertionsDisabled -> g
     int estimatedDexCodeSize -> c
-    1:1:void <clinit>():168:168 -> <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):181:181 -> <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):173:186 -> <init>
-    1:2:void createNewGroup():190:191 -> a
-    3:6:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):196:199 -> a
-    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():315:315 -> a
-    7:7:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):199 -> 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():314:314 -> a
+    7:7:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():315:315 -> a
-    8:8:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):199 -> a
-    9:15:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):199:205 -> a
-    16:17:java.util.List build(com.android.tools.r8.horizontalclassmerging.MergeGroup):215:216 -> a
-    18:18:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):219:219 -> a
-    19:19: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):57:57 -> a
-    19:19:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):219 -> a
-    20:23:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger buildSingle(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):225:228 -> a
-    1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder addEquivalent(com.android.tools.r8.graph.ProgramMethod):210:210 -> b
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.eq:
+    8:8:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():314:314 -> a
+    8:8:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200 -> a
+    9:15:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):200:206 -> a
+    16:17:java.util.List build(com.android.tools.r8.horizontalclassmerging.MergeGroup):216:217 -> a
+    18:18:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):220:220 -> a
+    19:19: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
+    19:19:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):220 -> a
+    20:23: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.Xp:
     java.util.List instanceInitializerMergers -> a
     java.util.Map equivalentInstanceInitializerMergers -> b
     1:3:void <init>(java.util.List,java.util.Map):34:36 -> <init>
@@ -37695,7 +37471,7 @@
     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.cE:
+com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.VD:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap instanceFieldMap -> e
     com.android.tools.r8.graph.DexProgramClass target -> d
     boolean $assertionsDisabled -> f
@@ -37790,23 +37566,23 @@
     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.PF:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.IF:
     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.QF:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.JF:
     1:1:void <init>():11:11 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.lang.Object) -> a
     java.lang.Object preprocess(java.util.Collection,java.util.concurrent.ExecutorService) -> a
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing asMultiClassPolicyWithPreprocessing() -> b
     boolean isMultiClassPolicyWithPreprocessing() -> h
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.RF:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.KF:
     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.PL:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.FL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -37826,7 +37602,7 @@
     boolean isMultiClassPolicyWithPreprocessing() -> h
     boolean isSingleClassPolicy() -> i
     boolean shouldSkipPolicy() -> j
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.QL:
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.GL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:8:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):23:30 -> a
@@ -37845,7 +37621,7 @@
     1:1:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):67:67 -> 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):67 -> b
-com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.RL:
+com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.HL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():63:63 -> <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):71:71 -> a
@@ -37886,12 +37662,12 @@
     52:63: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):140:151 -> a
     64:70:boolean verifyPolicyOrderingConstraints(java.util.List):242:248 -> a
     71:71:boolean lambda$verifyPolicyOrderingConstraints$0(com.android.tools.r8.horizontalclassmerging.Policy):244:244 -> a
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.OU:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.EU:
     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.rX:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.hX:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
@@ -37915,18 +37691,18 @@
     6:6:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):55 -> a
     7:9:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):57:59 -> a
     10:10:java.util.Collection getProgramRoots():64:64 -> a
-    11:11:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    11:11:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):73:73 -> a
+    12:12:java.util.Collection com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
+    12:12:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74 -> a
+    13:13:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74:74 -> a
+    14:14:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
     1:1:java.util.List lambda$calculateSubtyping$0(com.android.tools.r8.graph.DexProgramClass):59:59 -> b
-    2:2:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):73:73 -> b
-    3:3:java.util.Collection com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> b
-    3:3:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74 -> b
-    4:4:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74:74 -> b
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.KX:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.AX:
     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$Builder -> com.android.tools.r8.internal.JX:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.zX:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():45:45 -> <clinit>
@@ -37939,7 +37715,7 @@
     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.TY:
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.JY:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> i
@@ -37949,106 +37725,109 @@
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> j
     java.util.Map originalSuperTypes -> l
     com.android.tools.r8.com.google.common.collect.BiMap reservedInterfaceSignatures -> m
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):63:63 -> <init>
-    2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):53:69 -> <init>
-    1:4:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):141:144 -> a
-    5:13:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):143:151 -> a
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):64:64 -> <init>
+    2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):54:70 -> <init>
+    1:4:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):142:145 -> a
+    5:13:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):144:152 -> a
     14:14:com.android.tools.r8.graph.NestHostClassAttribute com.android.tools.r8.graph.TreeFixerBase.fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):273:273 -> a
-    14:14:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):151 -> a
-    15:16:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):151:152 -> a
+    14:14:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):152 -> a
+    15:16:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):152:153 -> a
     17:26:java.util.List com.android.tools.r8.graph.TreeFixerBase.fixupNestMemberAttributes(java.util.List):279:288 -> a
-    17:26:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):152 -> a
-    27:27:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):152:152 -> a
-    28:34:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):166:172 -> a
+    17:26:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):153 -> a
+    27:27:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):153:153 -> a
+    28:34:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):167:173 -> a
     35:35:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():178:178 -> a
-    35:35:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):174 -> a
-    36:49:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):176:189 -> a
-    50:51:com.android.tools.r8.graph.DexTypeList fixupInterfaces(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexTypeList):248:249 -> a
-    52:66:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):279:293 -> a
-    67:73:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):291:297 -> a
-    74:81:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):295:302 -> a
-    82:99:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):301:318 -> a
+    35:35:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):175 -> a
+    36:49:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):177:190 -> a
+    50:51:com.android.tools.r8.graph.DexTypeList fixupInterfaces(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexTypeList):249:250 -> a
+    52:66:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):280:294 -> a
+    67:72:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):292:297 -> a
+    73:73:void com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter.<init>():20:20 -> a
+    73:73:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):297 -> a
+    74:74:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):299:299 -> a
+    75:81:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):297:303 -> a
+    82:99:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):302:319 -> a
     100:100:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    100:100:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):318 -> a
-    101:105:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):318:322 -> a
-    106:106:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):321:321 -> a
-    107:119:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):259:271 -> a
-    107:119:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):325 -> a
-    120:120:boolean lambda$fixupDirectMethod$4(java.util.Set,com.android.tools.r8.graph.DexMethod):294:294 -> a
-    121:122:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):354:355 -> a
-    123:136:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.horizontalclassmerging.TreeFixer.lookupReservedVirtualName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.collect.BiMap):331:344 -> a
-    123:136:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):358 -> a
-    137:166:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):361:390 -> a
+    100:100:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):319 -> a
+    101:105:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):319:323 -> a
+    106:106:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):322:322 -> a
+    107:119:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):260:272 -> a
+    107:119:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):326 -> a
+    120:120:boolean lambda$fixupDirectMethod$4(java.util.Set,com.android.tools.r8.graph.DexMethod):295:295 -> a
+    121:122:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):355:356 -> a
+    123:136:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.horizontalclassmerging.TreeFixer.lookupReservedVirtualName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.collect.BiMap):332:345 -> a
+    123:136:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):359 -> a
+    137:166:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):362:391 -> a
     167:167:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    167:167:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):389 -> a
-    168:168:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):393:393 -> a
-    169:173:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):374:378 -> a
-    174:200:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):375:401 -> a
+    167:167:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):390 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):394:394 -> a
+    169:173:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):375:379 -> a
+    174:200:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):376:402 -> a
     201:201:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):70:70 -> a
-    201:201:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):401 -> a
-    202:214:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):259:271 -> a
-    202:214:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):402 -> a
-    215:217:boolean lambda$fixupVirtualMethod$6(java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexMethodSignature):380:382 -> a
-    218:218:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):407:407 -> a
+    201:201:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):402 -> a
+    202:214:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):260:272 -> a
+    202:214:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):403 -> a
+    215:217:boolean lambda$fixupVirtualMethod$6(java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexMethodSignature):381:383 -> a
+    218:218:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):408:408 -> a
     219:219:boolean com.android.tools.r8.utils.ArrayUtils.isEmpty(java.lang.Object[]):51:51 -> a
-    219:219:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):407 -> a
-    220:234:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):411:425 -> a
-    235:235:java.lang.Object com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2248:2248 -> a
-    235:235:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2279 -> a
-    235:235:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):421 -> a
+    219:219:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):408 -> a
+    220:234:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):412:426 -> a
+    235:235:java.lang.Object com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):2246:2246 -> a
+    235:235:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2277 -> a
+    235:235:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    236:236:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2279:2279 -> a
-    236:236:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):421 -> a
-    237:248:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):421:432 -> a
+    236:236:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):2277:2277 -> a
+    236:236:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422 -> a
+    237:248:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):422:433 -> a
     249:249:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
-    249:249:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):432 -> a
-    250:252:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):432:434 -> a
-    253:253:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):408:408 -> a
-    254:254:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):423:423 -> a
+    249:249:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):433 -> a
+    250:252:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):433:435 -> a
+    253:253:com.android.tools.r8.graph.DexEncodedField[] fixupFields(com.android.tools.r8.graph.DexEncodedField[],java.util.Set):409:409 -> a
+    254:254:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424:424 -> a
     255:255:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):209:209 -> a
-    255:255:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):423 -> a
+    255:255:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     256:256:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):209:209 -> a
-    256:256:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):423 -> a
-    257:258:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):423:424 -> a
-    259:259:boolean lambda$fixupFields$7(java.util.Set,com.android.tools.r8.graph.DexField):424:424 -> a
-    260:260:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.TreeFixer.mapClassType(com.android.tools.r8.graph.DexType):443:443 -> a
-    260:260:com.android.tools.r8.graph.DexType lambda$fixupInterfaces$3(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexType):251 -> a
-    261:262:com.android.tools.r8.graph.DexType lambda$fixupInterfaces$3(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexType):252:253 -> a
-    263:263:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):449:449 -> a
-    264:264:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):455:455 -> a
-    265:265:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):461:461 -> a
-    1:11:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():126:136 -> b
-    12:12:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$0(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):178:178 -> b
-    13:18:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):195:200 -> b
+    256:256:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424 -> a
+    257:258:java.util.Optional lambda$fixupFields$8(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):424:425 -> a
+    259:259:boolean lambda$fixupFields$7(java.util.Set,com.android.tools.r8.graph.DexField):425:425 -> a
+    260:260:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.TreeFixer.mapClassType(com.android.tools.r8.graph.DexType):444:444 -> a
+    260:260:com.android.tools.r8.graph.DexType lambda$fixupInterfaces$3(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexType):252 -> a
+    261:262:com.android.tools.r8.graph.DexType lambda$fixupInterfaces$3(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexType):253:254 -> a
+    263:263:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):450:450 -> a
+    264:264:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):456:456 -> a
+    265:265:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):462:462 -> a
+    1:11:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():127:137 -> b
+    12:12:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$0(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):179:179 -> b
+    13:18:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):196:201 -> b
     19:19:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
-    19:19:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):199 -> b
-    20:31:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):206:217 -> b
-    32:32:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> b
-    33:42:java.lang.String com.android.tools.r8.graph.DexItemFactory.createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2234:2243 -> b
-    33:42:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2290 -> b
-    33:42:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2303 -> b
-    33:42:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):216 -> b
-    43:45:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2291:2293 -> b
-    43:45:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2303 -> b
-    43:45:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):216 -> b
-    46:53:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):218:225 -> b
+    19:19:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):200 -> b
+    20:31:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):207:218 -> b
+    32:32:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217:217 -> b
+    33:42:java.lang.String com.android.tools.r8.graph.DexItemFactory.createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):2232:2241 -> b
+    33:42:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2288 -> b
+    33:42:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2301 -> b
+    33:42:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
+    43:45:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):2289:2291 -> b
+    43:45:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):2301 -> b
+    43:45:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):217 -> b
+    46:53:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):219:226 -> b
     54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexMember.getContextType():37:37 -> b
     54:54:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):70 -> b
-    54:54:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):226 -> b
+    54:54:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):227 -> b
     55:55:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):70:70 -> b
-    55:55:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):226 -> b
-    56:57:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):227:228 -> b
-    58:70:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):232:244 -> b
-    71:71:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):235:235 -> b
-    72:73:boolean lambda$fixupDirectMethod$5(java.util.Set,com.android.tools.r8.graph.DexMethod):306:307 -> b
-    74:74:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):443:443 -> b
-    1:6:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):156:161 -> c
+    55:55:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):227 -> b
+    56:57:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):228:229 -> b
+    58:70:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):233:245 -> b
+    71:71:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):236:236 -> b
+    72:73:boolean lambda$fixupDirectMethod$5(java.util.Set,com.android.tools.r8.graph.DexMethod):307:308 -> b
+    74:74:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):444:444 -> b
+    1:6:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):157:162 -> c
     7:7:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):189:189 -> c
-    7:7:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):161 -> c
-    8:8:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):181:181 -> c
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.d20:
+    7:7:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):162 -> c
+    8:8:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):182:182 -> c
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.T10:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
@@ -38078,7 +37857,7 @@
     52:52:boolean lambda$getAccessFlags$0(com.android.tools.r8.graph.MethodAccessFlags):119:119 -> a
     53:53:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():144:144 -> a
     53:53:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):183 -> a
-    54:54: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):322:322 -> a
+    54:54: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):309:309 -> a
     54:54:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():144 -> a
     54:54:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):183 -> a
     55:91:void mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):186:222 -> a
@@ -38103,7 +37882,7 @@
     139:144: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,java.util.function.Consumer):265:270 -> a
     145:145:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():144:144 -> a
     145:145: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,java.util.function.Consumer):271 -> a
-    146:146: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):322:322 -> a
+    146:146: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):309:309 -> a
     146:146:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getNewMethodReference():144 -> a
     146:146: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,java.util.function.Consumer):271 -> a
     147:168: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,java.util.function.Consumer):272:293 -> a
@@ -38126,7 +37905,7 @@
     13:17:boolean isTrivial():169 -> d
     1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):133:133 -> e
     1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):136:136 -> f
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.c20:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.S10:
     java.util.List methods -> a
     1:2:void <init>():48:49 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):52:52 -> a
@@ -38134,7 +37913,7 @@
     3:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):59:76 -> a
     3:20:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):82 -> a
     21:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):83:83 -> a
-com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo -> com.android.tools.r8.internal.g20:
+com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo -> com.android.tools.r8.internal.W10:
     com.android.tools.r8.shaking.KeepMethodInfo$Joiner keepInfo -> b
     com.android.tools.r8.graph.DexMethod representative -> a
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):16:16 -> <init>
@@ -38142,7 +37921,7 @@
     1:1:void amendKeepInfo(com.android.tools.r8.shaking.KeepMethodInfo):21:21 -> a
     2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner getKeepInfo():29:29 -> a
     1:1:com.android.tools.r8.graph.DexMethod getRepresentative():25:25 -> b
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.ba:
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():53:53 -> <clinit>
@@ -38161,14 +37940,14 @@
     39:39:com.android.tools.r8.androidapi.ComputedApiLevel lambda$getApiReferenceLevel$3(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.ProgramMethod):107:107 -> a
     1:1:boolean isEmpty():73:73 -> b
     2:2:java.lang.Boolean lambda$getCode$1(com.android.tools.r8.graph.ProgramMethod):82:82 -> b
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.Z9:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.Y9:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder classInitializers -> a
     1:1:void <clinit>():110:110 -> <clinit>
     1:3:void <init>():110:112 -> <init>
     1:3:void add(com.android.tools.r8.graph.ProgramMethod):115:117 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger build():121:121 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.aa:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.Z9:
     com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger this$0 -> c
     int maxLocals -> b
     int maxStack -> a
@@ -38185,7 +37964,7 @@
     18:22:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):144 -> a
     23:38: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):160:175 -> a
     23:38:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):144 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.ba:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.aa:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod syntheticMethodReference -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> d
@@ -38208,7 +37987,7 @@
     1:1:int computeHashCode():273:273 -> m0
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():283:283 -> q0
     1:1:java.lang.String toString():303:303 -> toString
-com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.Qd:
+com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.Pd:
     com.android.tools.r8.graph.DexField classIdField -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> e
@@ -38216,51 +37995,34 @@
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():16:16 -> <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):26:30 -> <init>
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():35:35 -> A0
     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):36:36 -> a
     2:2:java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod):42:42 -> a
     3:6:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):46:49 -> a
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.QX:
+    boolean isHorizontalClassMergingCode() -> w0
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():35:35 -> z0
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.GX:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.List instanceInitializers -> d
-    java.util.List classInitializers -> c
+    java.util.List methods -> c
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.List,java.util.List,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$1):26:26 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.List,java.util.List):37:41 -> <init>
-    1:1:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider):46:46 -> a
-    2:3:void convertClassInitializers(java.util.concurrent.ExecutorService):50:51 -> a
-    4:7:com.android.tools.r8.graph.AppView com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.createAppViewForConversion():72:75 -> a
-    4:7:void convertClassInitializers(java.util.concurrent.ExecutorService):51 -> a
-    8:8:void convertClassInitializers(java.util.concurrent.ExecutorService):51:51 -> a
-    9:9:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):317:317 -> a
-    9:9:void convertClassInitializers(java.util.concurrent.ExecutorService):51 -> a
-    10:10:void convertClassInitializers(java.util.concurrent.ExecutorService):52:52 -> a
-    11:13:void com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):80:82 -> a
-    11:13:void lambda$convertClassInitializers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):53 -> a
-    14:14:void com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):81:81 -> a
-    14:14:void lambda$convertClassInitializers$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):53 -> a
-    1:2:void convertInstanceInitializers(java.util.concurrent.ExecutorService):59:60 -> b
-    3:6:com.android.tools.r8.graph.AppView com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.createAppViewForConversion():72:75 -> b
-    3:6:void convertInstanceInitializers(java.util.concurrent.ExecutorService):60 -> b
-    7:7:void convertInstanceInitializers(java.util.concurrent.ExecutorService):60:60 -> b
-    8:8:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):317:317 -> b
-    8:8:void convertInstanceInitializers(java.util.concurrent.ExecutorService):60 -> b
-    9:9:void convertInstanceInitializers(java.util.concurrent.ExecutorService):61:61 -> b
-    10:12:void com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):80:82 -> b
-    10:12:void lambda$convertInstanceInitializers$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):62 -> b
-    13:13:void com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):81:81 -> b
-    13:13:void lambda$convertInstanceInitializers$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):62 -> b
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.PX:
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.List,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$1):26:26 -> <init>
+    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):315:315 -> 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$Builder -> com.android.tools.r8.internal.FX:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.List instanceInitializers -> d
-    java.util.List classInitializers -> c
+    java.util.List methods -> c
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$1):89:89 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider):97:97 -> <init>
-    3:9:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider):93:99 -> <init>
-    1:1:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder addClassInitializer(com.android.tools.r8.graph.ProgramMethod):103:103 -> a
-    2:2:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter build():113:113 -> a
-    1:1:com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder addInstanceInitializer(com.android.tools.r8.graph.ProgramMethod):108:108 -> b
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$1):72:72 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider):79:79 -> <init>
+    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.policies.AllInstantiatedOrUninstantiated -> com.android.tools.r8.internal.B1:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
@@ -38269,19 +38031,19 @@
     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.m9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.l9:
     com.android.tools.r8.utils.InternalOptions options -> b
     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.l9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.k9:
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification NOT_ABSTRACT -> c
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification ABSTRACT -> b
     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.C9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.B9:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> c
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):19:21 -> <init>
@@ -38298,7 +38060,7 @@
     6:6:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269 -> a
     6:6: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.tk:
+com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.ok:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> c
     boolean $assertionsDisabled -> d
@@ -38311,7 +38073,7 @@
     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.CB:
+com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.vB:
     int maxGroupSize -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -38326,7 +38088,7 @@
     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.LimitInterfaceGroups -> com.android.tools.r8.internal.DB:
+com.android.tools.r8.horizontalclassmerging.policies.LimitInterfaceGroups -> com.android.tools.r8.internal.wB:
     int maxGroupSize -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
     1:6:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):29:34 -> a
@@ -38339,19 +38101,19 @@
     25:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):35 -> a
     26:26:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):37:37 -> a
     1:1:java.lang.String getName():61:61 -> e
-com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.XE:
+com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.QE:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     1:35:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):25:59 -> a
-    36:37:boolean lambda$apply$1(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):34:35 -> a
-    38:38:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$addExact$2(com.android.tools.r8.com.google.common.collect.Multiset):63:63 -> a
-    39:41:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts.getExactMergeKey(com.android.tools.r8.graph.DexProgramClass):67:69 -> a
-    39:41:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63 -> a
-    42:42:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63:63 -> a
-    1:1:void lambda$apply$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass):26:26 -> b
+    36:36:void lambda$apply$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass):26:26 -> a
+    37:38:boolean lambda$apply$1(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):34:35 -> a
+    39:39:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$addExact$2(com.android.tools.r8.com.google.common.collect.Multiset):63:63 -> a
+    40:42:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts.getExactMergeKey(com.android.tools.r8.graph.DexProgramClass):67:69 -> a
+    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.IG:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.yG:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
@@ -38359,13 +38121,13 @@
     2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
     2:2: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.NoCheckDiscard -> com.android.tools.r8.internal.JG:
+com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.zG:
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> b
     com.android.tools.r8.utils.InternalOptions options -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView):19:21 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.KG:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.AG:
     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
@@ -38393,7 +38155,7 @@
     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.NoClassInitializerCycles -> com.android.tools.r8.internal.NG:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles -> com.android.tools.r8.internal.DG:
     java.util.Map allGroups -> c
     com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation singleCallerInformation -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -38440,7 +38202,7 @@
     1:1:void clear():263:263 -> d
     1:1:java.lang.String getName():268:268 -> e
     1:2:boolean shouldSkipPolicy():286:287 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.MG:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.CG:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles this$0 -> h
     java.util.Set seenClassInitializers -> c
@@ -38472,7 +38234,7 @@
     5:6:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer.clearSeen():316:317 -> c
     5:6:void trace():393 -> c
     1:4:void recordClassInitializerReachableFromTracingRoots(com.android.tools.r8.graph.DexProgramClass):343:346 -> d
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.LG:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.BG:
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer this$1 -> e
     1:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer,com.android.tools.r8.graph.ProgramMethod):409:410 -> <init>
     void registerCheckCast(com.android.tools.r8.graph.DexType,boolean) -> a
@@ -38501,11 +38263,11 @@
     41:41:void registerCallSite(com.android.tools.r8.graph.DexCallSite):575:575 -> a
     42:45:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):281:284 -> a
     42:45:void registerCallSite(com.android.tools.r8.graph.DexCallSite):575 -> a
-    46:46:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> a
+    46:46:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> a
     46:46:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):284 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     46:46:void registerCallSite(com.android.tools.r8.graph.DexCallSite):575 -> a
-    47:47:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> a
+    47:47:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> a
     47:47:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):284 -> a
     47:47:void registerCallSite(com.android.tools.r8.graph.DexCallSite):575 -> a
     48:50:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.fail():415:417 -> a
@@ -38631,13 +38393,13 @@
     21:21:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexProgramClass):429:429 -> g
     21:21:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):423 -> g
     21:21:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):565 -> g
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.OG:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.EG:
     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.PG:
+com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions -> com.android.tools.r8.internal.FG:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> d
@@ -38656,13 +38418,13 @@
     15:15:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):118 -> a
     16:16:com.android.tools.r8.graph.DexProto rewriteProto(com.android.tools.r8.graph.DexProto,java.util.Map):118:118 -> a
     17:17:com.android.tools.r8.graph.DexType lambda$rewriteProto$1(java.util.Map,com.android.tools.r8.graph.DexType):116:116 -> a
+    18:32:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.DexType,java.util.Map):129:143 -> a
     1:25:java.util.Set preprocess(java.util.Collection,java.util.concurrent.ExecutorService):72:96 -> b
     26:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions.rewriteReference(com.android.tools.r8.graph.DexMethod,java.util.Map):122:122 -> b
     26:30:java.util.Set preprocess(java.util.Collection,java.util.concurrent.ExecutorService):96 -> b
     31:41:java.util.Set preprocess(java.util.Collection,java.util.concurrent.ExecutorService):97:107 -> b
-    42:56:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.DexType,java.util.Map):129:143 -> b
     1:1:java.lang.String getName():149:149 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.QG:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.GG:
     java.util.Set deadEnumLiteMaps -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
@@ -38670,7 +38432,7 @@
     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.RG:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.HG:
     com.android.tools.r8.graph.AppView appView -> b
     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
@@ -38685,7 +38447,7 @@
     5:7:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     8:32: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.TG:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.JG:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):79:81 -> <init>
@@ -38740,13 +38502,13 @@
     1:1:boolean lambda$computeInheritedDefaultMethodsPerProgramType$6(com.android.tools.r8.graph.DexType):265:265 -> d
     1:1:java.lang.String getName():349:349 -> e
     1:1:boolean shouldSkipPolicy():354:354 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.SG:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.IG:
     java.util.Map inheritedDefaultMethods -> a
     java.util.Map defaultMethodsInheritedBySubclasses -> b
     1:3:void <init>(java.util.Map,java.util.Map):369:371 -> <init>
     1:1:java.util.Map getDefaultMethodsInheritedBySubclasses():379:379 -> a
     1:1:java.util.Map getInheritedDefaultMethods():375:375 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.UG:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.KG:
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):35:37 -> <init>
@@ -38763,7 +38525,7 @@
     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.VG:
+com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.LG:
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> b
@@ -38784,7 +38546,7 @@
     5:9:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():36:36 -> e
     1:1:boolean shouldSkipPolicy():31:31 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.WG:
+com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.MG:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> d
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> e
@@ -38806,7 +38568,7 @@
     43:46:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):37: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.XG:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.NG:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
@@ -38815,12 +38577,12 @@
     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.YG:
+com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.OG:
     java.util.Set failedResolutionHolders -> b
     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.ZG:
+com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.android.tools.r8.internal.PG:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():18:18 -> <clinit>
@@ -38835,7 +38597,7 @@
     20:20:boolean com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining.disallowInlining(com.android.tools.r8.graph.ProgramMethod):46 -> a
     20:20:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):57 -> a
     1:1:java.lang.String getName():62:62 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.aH:
+com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.QG:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> c
@@ -38861,15 +38623,15 @@
     7:13:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> b
     7:13:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):40 -> b
     1:1:java.lang.String getName():81:81 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.bH:
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.RG:
     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.cH:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.SG:
     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.dH:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMerging -> com.android.tools.r8.internal.TG:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> c
     boolean $assertionsDisabled -> d
@@ -38885,34 +38647,34 @@
     76:77:void com.android.tools.r8.horizontalclassmerging.MergeGroup.<init>(com.android.tools.r8.graph.DexProgramClass):47:48 -> a
     76:77:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):124 -> a
     78:84:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):124:130 -> a
-    85:97:boolean hasMultipleInstanceInitializersWithSameRelaxedSignature(com.android.tools.r8.graph.DexProgramClass):164:176 -> a
-    98:99:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):45:46 -> a
-    98:99:boolean hasMultipleInstanceInitializersWithSameRelaxedSignature(com.android.tools.r8.graph.DexProgramClass):176 -> a
-    100:100:boolean hasMultipleInstanceInitializersWithSameRelaxedSignature(com.android.tools.r8.graph.DexProgramClass):177:177 -> a
-    101:101:boolean lambda$hasMultipleInstanceInitializersWithSameRelaxedSignature$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod):179:179 -> a
-    102:102:java.util.Optional getOrComputeInstanceInitializerDescription(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodMap):197:197 -> a
-    103:106:java.util.Optional lambda$getOrComputeInstanceInitializerDescription$2(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):200:203 -> a
-    107:114:com.android.tools.r8.graph.DexMethod getRelaxedSignature(com.android.tools.r8.graph.ProgramMethod):208:215 -> a
-    115:116:com.android.tools.r8.graph.DexMethod getRelaxedSignature(com.android.tools.r8.graph.ProgramMethod):214:215 -> a
-    117:117:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):2443:2443 -> a
-    117:117:com.android.tools.r8.graph.DexMethod getRelaxedSignature(com.android.tools.r8.graph.ProgramMethod):215 -> a
-    118:118:com.android.tools.r8.graph.DexMethod getRelaxedSignature(com.android.tools.r8.graph.ProgramMethod):216:216 -> a
-    119:119:com.android.tools.r8.graph.DexType lambda$getRelaxedSignature$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):211:211 -> a
-    120:133:void setInstanceFieldMaps(java.lang.Iterable,com.android.tools.r8.horizontalclassmerging.MergeGroup):220:233 -> a
-    134:155:void setInstanceFieldMaps(java.lang.Iterable,com.android.tools.r8.horizontalclassmerging.MergeGroup):230:251 -> a
-    156:156:void lambda$setInstanceFieldMaps$5(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Map,com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap,com.android.tools.r8.graph.DexProgramClass):242:242 -> a
-    157:161: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.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 -> b
+    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):45:46 -> 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
+    103:103:java.util.Optional getOrComputeInstanceInitializerDescription(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.ProgramMethodMap):197:197 -> a
+    104:107:java.util.Optional lambda$getOrComputeInstanceInitializerDescription$2(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):200:203 -> a
+    108:115:com.android.tools.r8.graph.DexMethod getRelaxedSignature(com.android.tools.r8.graph.ProgramMethod):208:215 -> a
+    116:117:com.android.tools.r8.graph.DexMethod getRelaxedSignature(com.android.tools.r8.graph.ProgramMethod):214:215 -> a
+    118:118:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createInstanceInitializer(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList):2441:2441 -> a
+    118:118:com.android.tools.r8.graph.DexMethod getRelaxedSignature(com.android.tools.r8.graph.ProgramMethod):215 -> a
+    119:119:com.android.tools.r8.graph.DexMethod getRelaxedSignature(com.android.tools.r8.graph.ProgramMethod):216:216 -> a
+    120:120:com.android.tools.r8.graph.DexType lambda$getRelaxedSignature$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):211:211 -> a
+    121:134:void setInstanceFieldMaps(java.lang.Iterable,com.android.tools.r8.horizontalclassmerging.MergeGroup):220:233 -> a
+    135:156:void setInstanceFieldMaps(java.lang.Iterable,com.android.tools.r8.horizontalclassmerging.MergeGroup):230:251 -> a
+    157:157:void lambda$setInstanceFieldMaps$5(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.Map,com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap,com.android.tools.r8.graph.DexProgramClass):242:242 -> a
+    158:162: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.eH:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.UG:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> b
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> c
     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.fH:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.VG:
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set dontMergeTypes -> e
@@ -38924,7 +38686,7 @@
     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.gH:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.WG:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -38934,26 +38696,26 @@
     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.hH:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.XG:
     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):608:608 -> 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.iH:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.YG:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set allServiceImplementations -> c
     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.jH:
+com.android.tools.r8.horizontalclassmerging.policies.NoVerticallyMergedClasses -> com.android.tools.r8.internal.ZG:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
     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.kH:
+com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> com.android.tools.r8.internal.aH:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():33:33 -> <clinit>
@@ -38986,7 +38748,7 @@
     59:59:boolean hasNonAbstractDefinitionInSuperInterface(java.lang.Iterable,com.android.tools.r8.graph.ProgramMethod):118 -> a
     60:65: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.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.lH:
+com.android.tools.r8.horizontalclassmerging.policies.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.bH:
     java.util.Map inheritedInterfaceMethodsCache -> d
     com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph graph -> b
     java.util.Map nonPublicVirtualMethodSignaturesCache -> e
@@ -39027,12 +38789,12 @@
     3:3:void lambda$getOrComputeNonPublicVirtualMethodSignaturesInComponent$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClass):161:161 -> c
     1:3:void clear():190:192 -> d
     1:1:java.lang.String getName():197:197 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.GH:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.wH:
     com.android.tools.r8.graph.AppView appView -> b
     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.yK:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.oK:
     java.util.Map committed -> d
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
@@ -39045,14 +38807,14 @@
     2:39:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.lang.Object):58 -> a
     40:40:java.util.Set computeSuperInterfaces(com.android.tools.r8.graph.DexProgramClass):119:119 -> a
     41:41:java.util.Set computeSubInterfaces(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):124:124 -> a
-    42:61:java.util.Set computeTransitiveSubOrSuperInterfaces(com.android.tools.r8.graph.DexProgramClass,java.util.function.Function):131:150 -> a
-    62:62:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces.preprocess(java.util.Collection,java.util.concurrent.ExecutorService):165:165 -> a
-    62:62:java.lang.Object preprocess(java.util.Collection,java.util.concurrent.ExecutorService):58 -> a
-    1:1:java.lang.Iterable lambda$computeSubInterfaces$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):125:125 -> b
+    42:42:java.lang.Iterable lambda$computeSubInterfaces$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):125:125 -> a
+    43:62:java.util.Set computeTransitiveSubOrSuperInterfaces(com.android.tools.r8.graph.DexProgramClass,java.util.function.Function):131:150 -> a
+    63:63:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces.preprocess(java.util.Collection,java.util.concurrent.ExecutorService):165:165 -> a
+    63:63:java.lang.Object preprocess(java.util.Collection,java.util.concurrent.ExecutorService):58 -> a
     1:1:void clear():155:155 -> d
     1:1:java.lang.String getName():160:160 -> e
     1:1:boolean shouldSkipPolicy():170:170 -> j
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.xK:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.nK:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Set superInterfaces -> c
     java.util.Set subInterfaces -> d
@@ -39065,7 +38827,7 @@
     19:19:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():208:208 -> a
     1:1:boolean lambda$add$1(com.android.tools.r8.graph.DexProgramClass):203:203 -> b
     2:19:boolean isSafeToAddSubAndSuperInterfaces(com.android.tools.r8.graph.DexProgramClass,java.util.Set,java.util.Set):216:233 -> b
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.qM:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.gM:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():30:30 -> <clinit>
@@ -39076,7 +38838,7 @@
     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.oM:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.eM:
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> c
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
     boolean isAssumeNoSideEffectsMethod -> b
@@ -39091,14 +38853,14 @@
     6:6: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.pM:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.fM:
     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.yM:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.oM:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache parentClassMethodsCache -> e
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor reservedInterfaceSignaturesFor -> f
@@ -39126,44 +38888,44 @@
     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.graph.ImmediateProgramSubtypingInfo 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$DexClassSignaturesCache -> com.android.tools.r8.internal.rM:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.hM:
     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.sM:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.iM:
     boolean $assertionsDisabled -> b
     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.tM:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.jM:
     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.uM:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.kM:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory KEEP_ABSENT -> c
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory CLASS_HIERARCHY_SAFE -> b
     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.vM:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.lM:
     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.wM:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.mM:
     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>
     1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):116:116 -> a
     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
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.xM:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.nM:
     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.OS:
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.ES:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):28:29 -> <init>
     1:1:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.graph.ProgramMethod):71:71 -> a
@@ -39190,7 +38952,7 @@
     47:47:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):52 -> a
     48:68: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.ST:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.IT:
     com.android.tools.r8.graph.AppView appView -> b
     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
@@ -39199,14 +38961,14 @@
     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.UT:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.KT:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):26:28 -> <init>
     1:9:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.getMergeKey(com.android.tools.r8.graph.DexProgramClass):33:41 -> a
     1: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.TT:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.JT:
     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>
@@ -39215,25 +38977,25 @@
     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.VT:
+com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.LT:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> b
     com.android.tools.r8.synthesis.SyntheticItems synthetics -> c
     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.WT:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.MT:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     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.XT:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.NT:
     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.TX:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.JX:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> c
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):25:27 -> <init>
@@ -39249,12 +39011,12 @@
     4:8: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
     4:8: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.SX:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.IX:
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind SYNTHETIC -> b
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind NOT_SYNTHETIC -> c
     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.v10:
+com.android.tools.r8.horizontalclassmerging.policies.VerifyPolicyAlwaysSatisfied -> com.android.tools.r8.internal.l10:
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy policy -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():10:10 -> <clinit>
@@ -39267,14 +39029,14 @@
     30:30:java.lang.String getName():26:26 -> e
     27:27:java.lang.String getName():26:26 -> e
     1:1:boolean shouldSkipPolicy():31:31 -> j
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.NU:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.DU:
     java.util.Map singleClinitCallers -> b
     com.android.tools.r8.utils.collections.ProgramMethodMap singleCallers -> a
     1:3:void <init>(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.Map):42:44 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder builder(com.android.tools.r8.graph.AppView):48:48 -> a
     2:2:com.android.tools.r8.graph.ProgramMethod getSingleCaller(com.android.tools.r8.graph.ProgramMethod):52:52 -> a
     3:3:com.android.tools.r8.graph.ProgramMethod getSingleClassInitializerCaller(com.android.tools.r8.graph.DexProgramClass):56:56 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.MU:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.CU:
     java.util.Map clinitCallers -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.collections.ProgramMethodMap callers -> b
@@ -39287,7 +39049,7 @@
     13:13:void lambda$build$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):86:86 -> a
     14:14:void lambda$build$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,java.util.Optional):86:86 -> a
     15:15:void processMethod(com.android.tools.r8.graph.ProgramMethod):91:91 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.LU:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.BU:
     com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder this$0 -> f
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
@@ -39406,7 +39168,7 @@
     7:7:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexProgramClass):130:130 -> g
     7:7:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):124 -> g
     7:7:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):254 -> g
-com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.la:
+com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.ka:
     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):20:20 -> <init>
@@ -39417,7 +39179,7 @@
     1:1:void forEachMethod(java.util.function.Consumer):45:45 -> forEachMethod
     1:4:com.android.tools.r8.references.ClassReference getClassReference():26:29 -> getClassReference
     1:2:java.lang.String getSourceFile():34:35 -> getSourceFile
-com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.Mj:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.Hj:
     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
@@ -39428,14 +39190,14 @@
     1:4: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.Mp:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.Fp:
     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.zE:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.sE:
     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
@@ -39445,7 +39207,7 @@
     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.n10:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.d10:
     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>
@@ -39578,91 +39340,91 @@
     1:3:com.android.tools.r8.graph.DexType com.android.tools.r8.androidapi.ApiReferenceStubber$ReferencesToApiLevelUseRegistry$$InternalSyntheticOutline$128$fa4d2f1aaebefe56a72bd0d8d45ffdaa11db5a921b4ae78a58021043b9c16d22$0.m(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.AppServices$Builder$DataResourceProviderVisitor$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.o2:
+com.android.tools.r8.internal.AppServices$Builder$DataResourceProviderVisitor$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.n2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.StringBuilder com.android.tools.r8.graph.AppServices$Builder$DataResourceProviderVisitor$$InternalSyntheticOutline$128$1b9a9c3997290883e73a01d40bf4d3e6803f9ca951c5774170dba710a59428cb$0.m(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.ApplicationReader$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.r2:
+com.android.tools.r8.internal.ApplicationReader$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.q2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:4:java.lang.String com.android.tools.r8.dex.ApplicationReader$$InternalSyntheticOutline$128$9f54f232c90535949cbd79764f24cb98be32503bebdfcbf91538e9404314da22$0.m(com.android.tools.r8.graph.DexType,java.lang.StringBuilder,java.lang.String):0:3 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.ArchiveClassFileProvider$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.G2:
+com.android.tools.r8.internal.ArchiveClassFileProvider$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.F2:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.ArchiveClassFileProvider$$InternalSyntheticOutline$128$fcf1b6b975830033929cccf6ad2b54a77cab1d87d8c3fcbcd1f412b054bd8dde$0.m(java.lang.String,java.lang.String):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Y3:
+com.android.tools.r8.internal.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.X3:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:6:void com.android.tools.r8.androidapi.AvailableApiExceptions$$InternalSyntheticOutline$128$20e6908fb16c2dd8ad959b1c1a6646d5062d52ffebb6111c792ca6515e114c85$0.m(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.util.Set,java.lang.String,java.lang.String):0:5 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.a4:
+com.android.tools.r8.internal.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Z3:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.BackportedMethodListCommand$$InternalSyntheticOutline$128$7b25eb1be35d851e67f562f9da6a58cac1f92adedb289ac8c30b03bb2cd9fef7$0.m(java.lang.StringBuilder,java.lang.String,java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.b4:
+com.android.tools.r8.internal.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.a4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.BackportedMethodListCommand$Builder$$InternalSyntheticOutline$128$74531d99dd9e8c41302dc64bf7c1ad28bdce38f5e1cbae1669b2746d1cca7f73$0.m(java.lang.String,int):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.t4:
+com.android.tools.r8.internal.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.s4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock$$InternalSyntheticOutline$128$b6dd67f260863294e1347834de9654f6bdbe9ba876ac452b76d49eee6a2321aa$0.m(com.android.tools.r8.ir.code.BasicBlock):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.c5:
+com.android.tools.r8.internal.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.b5:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.bisect.BisectState$Range$$InternalSyntheticOutline$128$ce08529379ee2f531b289ce75fde83cc622d5b95d2bff129f3fff11db0ec6f8a$0.m(java.lang.StringBuilder,int,java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.CfConstClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.internal.CfConstClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.T6:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.cf.code.CfConstClass$$InternalSyntheticOutline$128$37c66abd9d2a2dc03f27fba98790669ca793ab689546056e468f3d38bbb416c6$0.m(java.lang.String,com.android.tools.r8.graph.DexType):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.CfSourceCode$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.t8:
+com.android.tools.r8.internal.CfSourceCode$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.s8:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:6:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode$$InternalSyntheticOutline$128$438dbc8eceffdeb61d226aaaed697fac8e37ed1b14c877d9379a82f963ca1ee0$0.m(java.lang.String,int,java.lang.String):0:5 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.CheckCast$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.o9:
+com.android.tools.r8.internal.CheckCast$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.n9:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:3:void com.android.tools.r8.code.CheckCast$$InternalSyntheticOutline$128$8425e8646f19f78a5cc679701fe1b8f81b89b53aa664c2c48409b2d425a4b181$0.m(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexType):0:2 -> a
+    1:3:void com.android.tools.r8.code.CheckCast$$InternalSyntheticOutline$128$0cd8e795b91e7e03e2ae5dc62b9c7e88807c64648c0df57be3707207ae08afdb$0.m(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.DexType):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.yg:
+com.android.tools.r8.internal.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.tg:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.StringBuilder com.android.tools.r8.DexFileMergerHelper$$InternalSyntheticOutline$128$9c9cadf1489a20b6e2f21254b49c29d5709cced0f7609f978195acf1f013b7c9$0.m(java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.bh:
+com.android.tools.r8.internal.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Wg:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.StringBuilder com.android.tools.r8.dex.DexOutputBuffer$$InternalSyntheticOutline$128$2fa3327658a3747aa1eac19934d5e19eadcfd88a0fe905e3e2553d0deedbdab7$0.m(java.lang.String,int,java.lang.String):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.GenerateLintFiles$HTMLBuilder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.El:
+com.android.tools.r8.internal.GenerateLintFiles$HTMLBuilder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.zl:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.GenerateLintFiles$HTMLBuilder$$InternalSyntheticOutline$128$ed6e21f6b1f6064d1f7d01ae8ade57a5452d19bf2d8e818564c5d5284e989760$0.m(java.lang.String,int,int):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.android.tools.r8.internal.lu:
+com.android.tools.r8.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.android.tools.r8.internal.eu:
 # {"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
@@ -39675,12 +39437,12 @@
     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.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.cW:
+com.android.tools.r8.internal.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.SV:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$InternalSyntheticThrowCCEIfNotNull$53$a45cf4883edbf7d524f6dd82ceaf6eb6b32f4f6bf2ef1c90a926aae8bee744ee$0.m(java.lang.Object) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.U9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.T9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis TRIVIAL -> e
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> c
@@ -39706,15 +39468,15 @@
     2:4:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> b
     2:4:void notifyCodeHasChanged():218 -> b
     1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():94:94 -> c
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.Q9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.P9:
     1:1:void <init>():67:67 -> <init>
     boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction) -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.R9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.Q9:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> c
     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.S9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.R9:
     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
@@ -39756,12 +39518,12 @@
     208:208:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):521:521 -> a
     209:210:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):546:547 -> a
     211:232:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):556:577 -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.T9:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.S9:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> c
     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.Zf:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.Uf:
     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
@@ -39794,9 +39556,9 @@
     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.qp:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.jp:
     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.pp:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.ip:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set initializedClassesOnNormalExit -> c
     com.android.tools.r8.graph.ProgramMethod context -> b
@@ -39817,7 +39579,7 @@
     65:65:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):160:160 -> a
     65:65:java.lang.Object visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):57 -> a
     1:1:java.util.Set build():69:69 -> b
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.ZZ:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.PZ:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> b
     boolean $assertionsDisabled -> c
@@ -39840,7 +39602,7 @@
     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.p10:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.f10:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -39934,7 +39696,7 @@
     8:8:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):278 -> b
     9:9: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):165:165 -> b
     9:9:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):278 -> b
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.o10:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.e10:
     java.util.Set trackedValues -> b
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> c
     boolean hasTrackedValueEscaped -> a
@@ -39942,21 +39704,21 @@
     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.w10:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.m10:
     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.E5:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.D5:
     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.jd:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.id:
     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
@@ -39971,7 +39733,7 @@
     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.od:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.nd:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -39994,12 +39756,12 @@
     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.PA:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.IA:
     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.vV:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.lV:
     java.util.Deque ssaEdges -> d
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -40132,14 +39894,14 @@
     172:177:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     178:178:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):247:247 -> b
     178:178:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.BY:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.rY:
     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.m10:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.c10:
     java.util.Map nodes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
@@ -40151,7 +39913,7 @@
     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.l10:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.b10:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -40166,7 +39928,7 @@
     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.A4:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.z4:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     boolean $assertionsDisabled -> c
@@ -40225,7 +39987,7 @@
     1:7:boolean com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption.definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):180 -> b
     1:7:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):176 -> b
     8:8:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):176:176 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.cj:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.Xi:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -40254,9 +40016,9 @@
     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.dj:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.Yi:
     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.wj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.rj:
     com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis fieldReadForInvokeReceiverAnalysis -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
@@ -40269,7 +40031,7 @@
     4:23:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):73:92 -> a
     24:29:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):91:96 -> a
     30:43:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):95:108 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.Fj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.Aj:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> d
@@ -40402,20 +40164,20 @@
     287:287:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
     287:287:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):401 -> a
     288:291:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):401:404 -> a
-    292:292:void lambda$recordAllAllocationsSitesProcessed$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):421:421 -> a
-    293:301:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):434:442 -> a
-    302:302:void lambda$waveDone$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):439:439 -> a
+    292:301:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):411:420 -> a
+    302:302:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
+    302:302:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):420 -> a
+    303:309:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):421:427 -> a
+    310:310:void lambda$recordAllAllocationsSitesProcessed$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.AppInfoWithLivenessModifier):421:421 -> a
+    311:319:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):434:442 -> a
+    320:320:void lambda$waveDone$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):439:439 -> a
     1:27:void initializeAbstractInstanceFieldValues():104:130 -> b
     28:28:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> b
     28:28:void initializeAbstractInstanceFieldValues():130 -> b
     29:29:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> b
     29:29:void initializeAbstractInstanceFieldValues():130 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:39:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):411:420 -> b
-    40:40:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> b
-    40:40:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):420 -> b
-    41:47:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):421:427 -> b
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.Dj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.yj:
     java.util.Map fieldWrites -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
     1:1:void <init>():454:454 -> <init>
@@ -40425,7 +40187,7 @@
     14:14:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):470:470 -> a
     15:16:void lambda$initialize$1(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):470:471 -> a
     17:24:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):478:485 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.Ej:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.zj:
     java.util.Map objectAllocations -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
     1:1:void <init>():502:502 -> <init>
@@ -40434,7 +40196,7 @@
     3:6:void lambda$initialize$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):509:512 -> a
     7:7:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):510:510 -> a
     8:15:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):518:525 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.Gj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.Bj:
     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
@@ -40446,7 +40208,7 @@
     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.FieldReadForInvokeReceiverAnalysis -> com.android.tools.r8.internal.Xj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis -> com.android.tools.r8.internal.Sj:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -40478,7 +40240,7 @@
     30:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
     31:35:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):41:45 -> a
     36:36:void lambda$recordFieldAccess$0(java.util.Set,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):46:46 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis -> com.android.tools.r8.internal.Yj:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis -> com.android.tools.r8.internal.Tj:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
     1:7:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder):32:38 -> a
@@ -40494,7 +40256,7 @@
     29:29:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):51:51 -> a
     30:33:boolean com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis.enqueueUsersForAnalysis(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):75:78 -> a
     30:33:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):51 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.bZ:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.RY:
     java.util.Set nonConstantFields -> g
     java.util.Map dependencies -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -40599,7 +40361,7 @@
     1:1:java.util.Set access$400(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):48:48 -> e
     1:1:java.util.Set access$500(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):48:48 -> f
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$600(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):48:48 -> g
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.aZ:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.QY:
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():309:309 -> <clinit>
@@ -40655,13 +40417,13 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):467:467 -> g
-com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState -> com.android.tools.r8.internal.H5:
+com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState -> com.android.tools.r8.internal.G5:
     com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):23:23 -> a
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState getInstance():18:18 -> e
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState -> com.android.tools.r8.internal.Gc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState -> com.android.tools.r8.internal.Fc:
     1:1:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):20:20 -> <init>
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState asArray() -> a
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue):24:24 -> a
@@ -40677,7 +40439,7 @@
     8:8:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState -> com.android.tools.r8.internal.Jc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState -> com.android.tools.r8.internal.Ic:
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> b
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):20:21 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):25:25 -> a
@@ -40696,10 +40458,10 @@
     15:15:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramField):56 -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState asClass() -> b
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():31:31 -> e
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteFieldState -> com.android.tools.r8.internal.Lc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteFieldState -> com.android.tools.r8.internal.Kc:
     1:1:void <init>():8:8 -> <init>
     boolean isConcrete() -> d
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState -> com.android.tools.r8.internal.Vc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState -> com.android.tools.r8.internal.Uc:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue):20:20 -> a
@@ -40720,18 +40482,18 @@
     11:11:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
     11:11:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):46 -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState asPrimitive() -> c
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteReferenceTypeFieldState -> com.android.tools.r8.internal.Yc:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteReferenceTypeFieldState -> com.android.tools.r8.internal.Xc:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):21:21 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState -> com.android.tools.r8.internal.fk:
+com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState -> com.android.tools.r8.internal.ak:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState asArray() -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory) -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState asClass() -> b
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState asPrimitive() -> c
     boolean isConcrete() -> d
-com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState -> com.android.tools.r8.internal.C00:
+com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState -> com.android.tools.r8.internal.s00:
     com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -40748,7 +40510,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isEmpty() -> c
     boolean isKnownFieldSet() -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.Qc:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.Pc:
     java.util.Set fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():21:21 -> <clinit>
@@ -40786,7 +40548,7 @@
     1:5:boolean equals(java.lang.Object):131:135 -> equals
     1:1:int hashCode():123:123 -> hashCode
     1:1:int size():118:118 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.Qh:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.Lh:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:3:void <clinit>():15:17 -> <clinit>
@@ -40799,7 +40561,7 @@
     boolean isEmpty() -> c
     boolean isKnownFieldSet() -> d
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():22:22 -> e
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.hk:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.ck:
     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
@@ -40889,13 +40651,13 @@
     55:55:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():283 -> c
     56:80:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():284:308 -> 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.gk:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.bk:
     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.Vp:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.Op:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> k
     com.android.tools.r8.ir.code.InvokeDirect parentConstructorCall -> l
@@ -40957,10 +40719,10 @@
     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):59:59 -> 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.Ty:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.My:
     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.eW:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.UV:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder -> i
     boolean $assertionsDisabled -> k
     java.util.Map computedValues -> j
@@ -41088,7 +40850,7 @@
     94:94:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):364:364 -> c
     94:94:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):284 -> c
     95:136:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):287:328 -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.kW:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.aW:
     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
@@ -41096,25 +40858,25 @@
     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():114:114 -> 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.fW:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.VV:
     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.hW:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.XV:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues INSTANCE -> a
     1:1:void <clinit>():105:105 -> <clinit>
     1:1:void <init>():107:107 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues getInstance():110:110 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.gW:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.WV:
     1:1:void <init>():117:117 -> <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():127:127 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.jW:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.ZV:
     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.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):100:100 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.iW:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.YV:
     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
@@ -41129,7 +40891,7 @@
     12:19:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):66:73 -> a
     20:20:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):72:72 -> a
     21:26:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():80:85 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.B00:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.r00:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -41145,21 +40907,21 @@
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction -> com.android.tools.r8.internal.s1:
     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.qe:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.pe:
     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.oe:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.ne:
     1:1:void <init>():65:65 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.pe:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.oe:
     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.tj:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.oj:
     1:1:void <init>():16:16 -> <init>
     boolean isFailedTransferResult() -> a
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():20:20 -> c
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.ku:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.du:
     java.util.Map blockExitStates -> c
     java.util.Map blockEntryStatesCache -> d
     boolean $assertionsDisabled -> e
@@ -41212,7 +40974,7 @@
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):49:49 -> b
     2:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.run(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):53:53 -> b
     2:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):49 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.QY:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.GY:
     boolean isFailedTransferResult() -> a
     boolean isAbstractState() -> b
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> c
@@ -41222,7 +40984,7 @@
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,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.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.Wi:
+com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.Ri:
     boolean value -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -41230,10 +40992,10 @@
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     1:2:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint create(int,boolean,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):28:29 -> a
     3:3:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):37:37 -> a
-    4:4:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    4:4:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):37 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    5:5:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):37 -> a
     6:10:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):39:43 -> a
     11:15:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):42:46 -> a
@@ -41247,7 +41009,7 @@
     28:28:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60:60 -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.Xi:
+com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.Si:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -41256,13 +41018,13 @@
     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.BG:
+com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.rG:
     com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint INSTANCE -> b
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,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.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.FH:
+com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.vH:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -41271,7 +41033,7 @@
     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.MH:
+com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.CH:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
@@ -41296,17 +41058,17 @@
     29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint.withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):87:87 -> a
     29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):63 -> a
     30:43:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):68:81 -> a
-com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.VH:
+com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.LH:
     long rawValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
     1:2:void <init>(int,long):21:22 -> <init>
     boolean test(long) -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):34:34 -> a
-    2:2:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    2:2:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    3:3:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     3:3:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):34 -> a
     4:8:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):36:40 -> a
     9:13:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):39:43 -> a
@@ -41315,14 +41077,14 @@
     15:21:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):43:49 -> a
     22:24:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):54:56 -> a
     1:1:long getRawValue():26:26 -> i
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.EU:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.uU:
     int argumentIndex -> b
     1:2:void <init>(int):14:15 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     1:1:com.android.tools.r8.ir.code.Value getArgument(com.android.tools.r8.ir.code.InvokeMethod):19:19 -> b
     boolean isArgumentConstraint() -> d
     1:1:int getArgumentIndex():23:23 -> h
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.FU:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.vU:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -41371,7 +41133,7 @@
     boolean isConjunction() -> e
     boolean isDisjunction() -> f
     boolean isNever() -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.HU:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.xU:
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory factory -> a
     java.util.Set seen -> d
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -41466,10 +41228,10 @@
     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.GU:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.wU:
     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.IU:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.yU:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -41499,7 +41261,7 @@
     57:58:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):81:82 -> a
     59:59:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
     59:59:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):82 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.JU:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.zU:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -41529,7 +41291,7 @@
     57:57:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isNever():0:0 -> a
     57:57:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):82 -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction asDisjunction() -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.KU:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.AU:
     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
@@ -41548,20 +41310,20 @@
     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.wB:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.pB:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):19:27 -> a
     10:10:boolean com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.isCallToSideEffectFreeFinalMethod(com.android.tools.r8.ir.code.InvokeMethod):119:119 -> a
     10:10:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):27 -> a
     11:15:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):28:32 -> a
-    16:16:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    16:16:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     16:16:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):32 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    17:17:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     17:17:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):32 -> a
     18:20:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):32:34 -> a
-com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.xi:
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.si:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set deadEnumLiteMaps -> c
@@ -41570,7 +41332,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):43:43 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):41:45 -> <init>
     1:1:void clearDeadEnumLiteMaps():59:59 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1593:1593 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1581:1581 -> a
     2:2:void clearDeadEnumLiteMaps():59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:11:void clearDeadEnumLiteMaps():59:67 -> a
@@ -41624,7 +41386,7 @@
     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.Hl:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.Cl:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedExtensionFields -> d
@@ -41638,48 +41400,48 @@
     204:205:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):102:103 -> a
     206:217:com.android.tools.r8.shaking.TreePrunerConfiguration com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.createTreePrunerConfiguration(com.android.tools.r8.shaking.Enqueuer$Mode):115:126 -> a
     206:217:com.android.tools.r8.shaking.TreePrunerConfiguration run(com.android.tools.r8.shaking.Enqueuer$Mode):104 -> a
-    218:218:java.util.Map lambda$recordDeadProtoExtensionField$2(com.android.tools.r8.graph.DexType):110:110 -> a
-    219:222:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):135:138 -> a
-    223:234:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):143:154 -> a
-    235:237:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.wasRemoved(com.android.tools.r8.graph.DexField):159:161 -> a
-    235:237:boolean lambda$run$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):103 -> a
-    238:250:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):167:179 -> a
-    251:251:void lambda$postOptimizeGeneratedExtensionRegistry$3(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):175:175 -> a
-    252:252:void lambda$postOptimizeGeneratedExtensionRegistry$3(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):173:173 -> a
-    253:253:void lambda$forEachClassInitializerWithRemovedExtensionFields$5(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,java.util.Map):194:194 -> a
-    254:254:void lambda$forEachClassInitializerWithRemovedExtensionFields$4(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):198:198 -> a
-    255:255:void lambda$forEachClassInitializerWithRemovedExtensionFields$4(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):197:197 -> a
-    256:258:void lambda$forEachClassInitializerWithRemovedExtensionFields$6(java.util.function.Consumer,com.android.tools.r8.graph.DexType):203:205 -> a
-    259:259:void lambda$forEachFindLiteExtensionByNumberMethod$8(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):216:216 -> a
-    260:260:boolean lambda$forEachFindLiteExtensionByNumberMethod$7(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> a
-    261:261:void lambda$forEachFindLiteExtensionByNumberMethod$9(com.android.tools.r8.ir.desugar.LambdaDescriptor):221:221 -> a
-    262:262:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):227:227 -> a
-    263:263:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> a
-    263:263:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):227 -> a
-    264:264:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228:228 -> a
-    265:269:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):233:237 -> a
-    270:270:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):236:236 -> a
-    271:271:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):244:244 -> a
-    272:272:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
-    272:272:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):244 -> a
-    273:281:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):244:252 -> a
-    282:282:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
-    282:282:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):252 -> a
+    218:221:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):108:111 -> a
+    222:222:java.util.Map lambda$recordDeadProtoExtensionField$2(com.android.tools.r8.graph.DexType):110:110 -> a
+    223:226:void rewriteCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):135:138 -> a
+    227:238:void rewriteClassInitializer(com.android.tools.r8.ir.code.IRCode):143:154 -> a
+    239:241:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.wasRemoved(com.android.tools.r8.graph.DexField):159:161 -> a
+    239:241:boolean lambda$run$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):103 -> a
+    242:254:void postOptimizeGeneratedExtensionRegistry(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):167:179 -> a
+    255:255:void lambda$postOptimizeGeneratedExtensionRegistry$3(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):175:175 -> a
+    256:256:void lambda$postOptimizeGeneratedExtensionRegistry$3(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):173:173 -> a
+    257:257:void lambda$forEachClassInitializerWithRemovedExtensionFields$5(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,java.util.Map):194:194 -> a
+    258:258:void lambda$forEachClassInitializerWithRemovedExtensionFields$4(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):198:198 -> a
+    259:259:void lambda$forEachClassInitializerWithRemovedExtensionFields$4(com.android.tools.r8.shaking.Enqueuer$Mode,java.util.Set,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):197:197 -> a
+    260:262:void lambda$forEachClassInitializerWithRemovedExtensionFields$6(java.util.function.Consumer,com.android.tools.r8.graph.DexType):203:205 -> a
+    263:263:void lambda$forEachFindLiteExtensionByNumberMethod$8(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):216:216 -> a
+    264:264:boolean lambda$forEachFindLiteExtensionByNumberMethod$7(com.android.tools.r8.graph.DexEncodedMethod):218:218 -> a
+    265:265:void lambda$forEachFindLiteExtensionByNumberMethod$9(com.android.tools.r8.ir.desugar.LambdaDescriptor):221:221 -> a
+    266:266:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):227:227 -> a
+    267:267:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> a
+    267:267:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):227 -> a
+    268:268:void handleFailedOrUnknownFieldResolution(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$Mode):228:228 -> a
+    269:273:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):233:237 -> a
+    274:274:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.DexField):236:236 -> a
+    275:275:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):244:244 -> a
+    276:276:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
+    276:276:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):244 -> a
+    277:285:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):244:252 -> a
+    286:286:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
+    286:286:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):252 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    283:283:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):258:258 -> a
-    284:286:void lambda$forEachDeadProtoExtensionField$10(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):267:269 -> a
-    1:4:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.Enqueuer$Mode):108:111 -> b
-    5:7:boolean wasRemoved(com.android.tools.r8.graph.DexField):159:161 -> b
-    8:10:void forEachDeadProtoExtensionField(java.util.function.Consumer):263:265 -> b
+    287:287:boolean isDeadProtoExtensionField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):258:258 -> a
+    288:290:void lambda$forEachDeadProtoExtensionField$10(java.util.function.Consumer,com.android.tools.r8.graph.FieldAccessInfo):267:269 -> a
+    1:3:boolean wasRemoved(com.android.tools.r8.graph.DexField):159:161 -> b
+    4:6:void forEachDeadProtoExtensionField(java.util.function.Consumer):263:265 -> b
     1:3:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):211:213 -> c
     1:2:void forEachMethodThatRequiresPostOptimization(java.util.function.Consumer):183:184 -> d
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.Gl:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.Bl:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):116:116 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):121:121 -> 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):122 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Rl:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Ml:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map builders -> d
@@ -41713,7 +41475,7 @@
     294:294:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):176 -> a
     295:297:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):177:179 -> a
     298:303:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):193:198 -> a
-    304:304:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):317:317 -> a
+    304:304:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):315:315 -> a
     304:304:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198 -> a
     305:315:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):199:209 -> a
     316:317: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
@@ -41774,7 +41536,7 @@
     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.Pl:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Kl:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> b
     java.util.Set val$seen -> a
     boolean $assertionsDisabled -> c
@@ -41787,7 +41549,7 @@
     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.Ql:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Ll:
     java.util.Set bypassClinitforInlining -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -41821,7 +41583,7 @@
     12:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeClass(com.android.tools.r8.graph.DexType):475:476 -> b
     12:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeGeneratedMessageLiteBuilder():465 -> b
     12:13:void extend(com.android.tools.r8.graph.SubtypingInfo):427 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Sl:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Nl:
     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
@@ -42016,7 +41778,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     201:201:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
     201:201:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):327 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.XO:
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.NO:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> i
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -42041,7 +41803,7 @@
     9:15:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):81 -> e
     16:19:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):82:85 -> e
     1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():39:39 -> g
-com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.YO:
+com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.OO:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     java.util.Map staticFieldValuesMap -> b
     java.util.Map staticFieldValuesMapDelayed -> c
@@ -42060,7 +41822,7 @@
     12:16: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 -> a
     17:25: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):60:68 -> a
     26:31: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.dP:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.TO:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -42116,7 +41878,7 @@
     43:43: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
     44:47: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):85:88 -> a
     44:47: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.wP:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.mP:
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableMessageType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> j
     com.android.tools.r8.graph.DexType methodToInvokeType -> n
@@ -42187,26 +41949,26 @@
     4:4:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
     4:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):184 -> b
     5:5:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):184:184 -> b
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.rP:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.hP:
     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):206:206 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):211:215 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):213:225 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):223:223 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.sP:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.iP:
     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):307:307 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):311:315 -> <init>
     7:7:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):313:313 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.tP:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.jP:
     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):324:324 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):329:333 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):331:338 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):336:336 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.uP:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.kP:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethodWithObject -> c
@@ -42219,7 +41981,7 @@
     23:31:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):265:273 -> <init>
     32:47:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):271:286 -> <init>
     48:48:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):284:284 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.vP:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.lP:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -42229,7 +41991,7 @@
     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):349:349 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):359:376 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.xP:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.nP:
     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
@@ -42247,20 +42009,20 @@
     8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():499:499 -> 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:14:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1574:1574 -> a
+    14:14:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1562:1562 -> a
     14:14:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:18:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1575:1578 -> a
+    15:18:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1563:1566 -> a
     15:18:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):70 -> a
     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():968:968 -> a
+    24:24:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():956:956 -> 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():969:969 -> a
+    26:26:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():957:957 -> a
     26:26:void setDeadProtoTypes(java.util.Set):83 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.AP:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.qP:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():11:11 -> <clinit>
@@ -42271,7 +42033,7 @@
     3:3:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
     3: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 -> a
     4:6: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
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.JP:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.zP:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -42362,7 +42124,7 @@
     4:19:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):309:324 -> b
     20:20:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):317:317 -> b
     21:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):306:306 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.GP:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.wP:
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
     1:3:void <init>(com.android.tools.r8.graph.DexString):259:261 -> <init>
     1:1:boolean hasNext():265:265 -> a
@@ -42374,7 +42136,7 @@
     9:9:int nextInt():291:291 -> b
     10:10:int nextInt():280:280 -> b
     11:11:int nextInt():271:271 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.HP:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.xP:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -42389,10 +42151,10 @@
     16:16:java.lang.Object next():324 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2.next():346:346 -> b
     17:17:java.lang.Object next():324 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.IP:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.yP:
     1:1:void <init>():369:369 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):369:369 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.KP:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.AP:
     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
@@ -42416,7 +42178,7 @@
     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.ye:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.xe:
     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>
@@ -42428,21 +42190,21 @@
     79:79:java.lang.String toString():37:37 -> toString
     38:38:java.lang.String toString():37:37 -> toString
     39:39:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82}}
-    80:80:java.lang.String toString():37:37 -> toString
-    81:81:java.lang.String toString():37:37 -> toString
-    82:82:java.lang.String toString():37:37 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77,"2":78,"3":79}}
+    77:77:java.lang.String toString():37:37 -> toString
+    78:78:java.lang.String toString():37:37 -> toString
+    79:79:java.lang.String toString():37:37 -> toString
     76:76:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.lC:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.eC:
     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():481:481 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> 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):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     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:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     4:4:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForConstString(com.android.tools.r8.utils.InternalOptions):125 -> a
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35 -> a
     5:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):36:39 -> a
@@ -42453,7 +42215,7 @@
     57:57:java.lang.String toString():54:54 -> toString
     58:58:java.lang.String toString():54:54 -> toString
     55:55:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.WO:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.MO:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.graph.AppView appView -> a
@@ -42619,7 +42381,7 @@
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):225:249 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$3(com.android.tools.r8.graph.DexType):361:361 -> b
     1:7:java.util.Map collectExtensionFields():257:263 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.ZO:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.PO:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -42686,11 +42448,11 @@
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():65:65 -> d
     1:1:boolean hasAuxData():43:43 -> e
     1:15:java.lang.String toString():202:216 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.aP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.QO:
     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.bP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.RO:
     boolean isMapFieldWithProto2EnumValue -> e
     boolean hasHasBit -> f
     boolean $assertionsDisabled -> g
@@ -42718,7 +42480,7 @@
     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.cP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.SO:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -42727,7 +42489,7 @@
     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.gP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.WO:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -42748,7 +42510,7 @@
     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$Builder -> com.android.tools.r8.internal.eP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.UO:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     boolean $assertionsDisabled -> f
@@ -42793,10 +42555,10 @@
     91:98:void removeUnusedSharedData():165:172 -> c
     99:99:void removeUnusedSharedData():171:171 -> c
     100:101:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.fP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.VO:
     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.mP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.cP:
     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
@@ -42805,18 +42567,18 @@
     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.nP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.dP:
     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.oP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.eP:
     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.pP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.fP:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -42828,7 +42590,7 @@
     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.qP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.gP:
     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>
@@ -42836,7 +42598,7 @@
     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.yP:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.oP:
     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
@@ -42847,7 +42609,7 @@
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     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.da:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.ca:
     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):629:629 -> 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
@@ -42857,7 +42619,7 @@
     16:16:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):64 -> a
     17:47:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):65:95 -> a
     48:91:com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect classInitializerCanBePostponed(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66:109 -> a
-com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.q3:
+com.android.tools.r8.ir.analysis.type.ArrayTypeElement -> com.android.tools.r8.internal.p3:
     com.android.tools.r8.ir.analysis.type.NullabilityVariants variants -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.analysis.type.TypeElement memberTypeLattice -> f
@@ -42902,14 +42664,14 @@
     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.C5:
+com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.B5:
     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 -> F
     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.P5:
+com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.O5:
     com.android.tools.r8.ir.analysis.type.BottomTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -42917,21 +42679,21 @@
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getInstance():15:15 -> E
     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.f6:
+com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.e6:
     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 -> F
     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.j9:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.i9:
     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 -> F
     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.Wa:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.Va:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> g
@@ -43006,7 +42768,7 @@
     boolean isClassType() -> s
     1:16:java.lang.String toString():170:185 -> toString
     17:26:java.lang.String toString():178:187 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.Ua:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.Ta:
     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
@@ -43031,11 +42793,11 @@
     18:19:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):378 -> a
     20:22:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):378:380 -> a
     1:2:boolean knownIfBothAreKnown():364:365 -> b
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.Va:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.Ua:
     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):389:391 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.pf:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.kf:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
@@ -43079,14 +42841,14 @@
     59:59:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
     59:59:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):77 -> a
     60:60:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):77:77 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.rh:
     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 -> F
     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.Eh:
+com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.zh:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -43142,7 +42904,7 @@
     boolean isNullType() -> k
     boolean isUnknown() -> l
     1:1:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound unknown():91:91 -> m
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.Bh:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():11:11 -> <clinit>
@@ -43182,7 +42944,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType():49:49 -> n
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound.getDynamicUpperBoundType():39:39 -> o
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():11 -> o
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound -> com.android.tools.r8.internal.Hh:
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound -> com.android.tools.r8.internal.Ch:
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> c
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound NULL_TYPE -> e
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound BOTTOM -> d
@@ -43212,54 +42974,54 @@
     17:20:boolean com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.verifyNotEffectivelyFinalClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):271:274 -> a
     17:20:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):70 -> a
     21:21:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):71:71 -> a
-    22:22:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeElement):100:100 -> a
-    23:23:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):163:163 -> a
-    24:27:boolean com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):85:88 -> a
-    24:27:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):165 -> a
-    28:28:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):166:166 -> a
-    29:31:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):177:179 -> a
-    29:31:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
-    32:32:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
-    32:32:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):179 -> a
-    32:32:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    22:25:boolean com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):85:88 -> a
+    22:25:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):42 -> a
+    22:25:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):225 -> a
+    26:28:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):43:45 -> a
+    26:28:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):225 -> a
+    29:29:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):226:226 -> a
+    30:30:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.ir.analysis.type.TypeElement):100:100 -> a
+    31:31:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):163:163 -> a
+    32:35:boolean com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):85:88 -> a
+    32:35:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):165 -> a
+    36:36:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):166:166 -> a
+    37:39:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):177:179 -> a
+    37:39:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    40:40:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
+    40:40:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):179 -> a
+    40:40:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    33:33:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
-    33:33:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):179 -> a
-    33:33:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
-    34:36:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):183:185 -> a
-    34:36:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
-    37:37:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
-    37:37:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):185 -> a
-    37:37:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    41:41:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
+    41:41:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):179 -> a
+    41:41:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    42:44:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):183:185 -> a
+    42:44:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):185 -> a
+    45:45:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    38:38:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
-    38:38:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):185 -> a
-    38:38:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
-    39:45:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):189:195 -> a
-    39:45:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
     46:46:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
-    46:46:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):195 -> a
+    46:46:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):185 -> a
     46:46:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
-    47:48:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):197:198 -> a
-    47:48:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
-    49:49:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
-    49:49:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):198 -> a
-    49:49:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
-    50:54:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):168:172 -> a
-    55:69:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):206:220 -> a
-    70:73:boolean com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):85:88 -> a
-    70:73:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):42 -> a
-    70:73:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):221 -> a
-    74:76:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):43:45 -> a
-    74:76:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):221 -> a
-    77:87:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):281:291 -> a
-    1:4:boolean com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):85:88 -> b
-    1:4:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):42 -> b
-    1:4:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):225 -> b
-    5:7:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):43:45 -> b
-    5:7:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):225 -> b
-    8:8:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.AppView):226:226 -> b
-    9:31:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.graph.AppView):230:252 -> b
+    47:53:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):189:195 -> a
+    47:53:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):195 -> a
+    54:54:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    55:56:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):197:198 -> a
+    55:56:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.joinNullability(com.android.tools.r8.ir.analysis.type.Nullability):150:150 -> a
+    57:57:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.meetDynamicLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):198 -> a
+    57:57:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):167 -> a
+    58:62:com.android.tools.r8.ir.analysis.type.DynamicType join(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):168:172 -> a
+    63:77:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):206:220 -> a
+    78:81:boolean com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):85:88 -> a
+    78:81:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):42 -> a
+    78:81:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):221 -> a
+    82:84:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):43:45 -> a
+    82:84:com.android.tools.r8.ir.analysis.type.DynamicType rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):221 -> a
+    85:107:boolean strictlyLessThan(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.graph.AppView):230:252 -> a
+    108:118:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound withNullability(com.android.tools.r8.ir.analysis.type.Nullability):281:291 -> a
     1:3:com.android.tools.r8.ir.analysis.type.ClassTypeElement getExactClassType():124:126 -> d
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():132:132 -> e
     1:5:boolean equals(java.lang.Object):257:261 -> equals
@@ -43278,7 +43040,7 @@
     2:2:boolean isUnknown():157 -> l
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType() -> n
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():104:104 -> o
-com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.ej:
+com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.Zi:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement):16:16 -> <init>
@@ -43309,21 +43071,21 @@
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ExactDynamicType.getExactClassType():31:31 -> o
     1:1:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ExactDynamicType.getDynamicUpperBoundType():21 -> o
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType():13 -> o
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.Jk:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.Ek:
     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 -> F
     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.Et:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.xt:
     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 -> F
     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.Ft:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.yt:
     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
@@ -43351,7 +43113,7 @@
     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$Builder -> com.android.tools.r8.internal.Ft$a:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.yt$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>
@@ -43359,14 +43121,14 @@
     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.ZC:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.SC:
     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 -> F
     1:1:int hashCode():26:26 -> hashCode
     1:1:java.lang.String toString():21:21 -> toString
-com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.HH:
+com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.xH:
     com.android.tools.r8.ir.analysis.type.NotNullDynamicType INSTANCE -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():21:23 -> <clinit>
@@ -43379,7 +43141,7 @@
     1:1:int hashCode():71:71 -> hashCode
     boolean isNotNullType() -> j
     1:1:com.android.tools.r8.ir.analysis.type.NotNullDynamicType get():28:28 -> n
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.NH:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.DH:
     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
@@ -43398,7 +43160,7 @@
     1:1:boolean isNullable():49:49 -> h
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():99:99 -> i
     1:13:java.lang.String toString():108:120 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.OH:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.EH:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement maybeNullVariant -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> d
@@ -43414,7 +43176,7 @@
     32:40:void com.android.tools.r8.ir.analysis.type.NullabilityVariants.set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     32:40:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):64 -> a
     41:42:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):65:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.FM:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.vM:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -43467,10 +43229,10 @@
     79:79:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):60:60 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
     boolean isPrimitiveType() -> y
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.EM:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.uM:
     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.MR:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.BR:
     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
@@ -43493,20 +43255,20 @@
     1:1:boolean equals(java.lang.Object):113:113 -> equals
     1:1:int hashCode():118:118 -> hashCode
     boolean isReferenceType() -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.KR:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.AR:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.sU:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.iU:
     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 -> F
     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.VU:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.LU:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -43514,7 +43276,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> E
     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.FY:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.vY:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -43522,7 +43284,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> E
     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.VZ:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.LZ:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -43547,7 +43309,7 @@
     69:79:com.android.tools.r8.graph.DexType toRefinedReceiverType(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):178:188 -> a
     1:4:void widening(com.android.tools.r8.ir.code.IRCode):56:59 -> b
     5:5:boolean verifyValuesUpToDate(java.lang.Iterable):82:82 -> b
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.b00:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.RZ:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():21:21 -> <clinit>
@@ -43660,7 +43422,7 @@
     8:8:boolean isPreciseType():384 -> x
     boolean isPrimitiveType() -> y
     boolean isReferenceType() -> z
-com.android.tools.r8.ir.analysis.type.TypeUtils -> com.android.tools.r8.internal.m00:
+com.android.tools.r8.ir.analysis.type.TypeUtils -> com.android.tools.r8.internal.c00:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:12:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):72:83 -> a
@@ -43778,13 +43540,13 @@
     87:87:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):86 -> a
     88:88:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):86:86 -> a
     89:93:void enqueueUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):96:100 -> a
-com.android.tools.r8.ir.analysis.type.TypeUtils$UserAndValuePair -> com.android.tools.r8.internal.l00:
+com.android.tools.r8.ir.analysis.type.TypeUtils$UserAndValuePair -> com.android.tools.r8.internal.b00:
     com.android.tools.r8.ir.code.InstructionOrPhi user -> a
     com.android.tools.r8.ir.code.Value value -> b
     1:3:void <init>(com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Value):43:45 -> <init>
     1:5:boolean equals(java.lang.Object):53:57 -> equals
     1:1:int hashCode():62:62 -> hashCode
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.q20:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.g20:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -43884,7 +43646,7 @@
     7:7:com.android.tools.r8.ir.analysis.value.SingleNumberValue createNullValue():45:45 -> a
     8:8:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):53:53 -> a
     9:9:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):58:58 -> a
-com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.R5:
+com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.Q5:
     com.android.tools.r8.ir.analysis.value.BottomValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -43893,7 +43655,7 @@
     1:1:int hashCode():44:44 -> hashCode
     1:1:java.lang.String toString():49:49 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.wd:
+com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.vd:
     boolean containsInt(int) -> a
     com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]) -> a
     boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue) -> a
@@ -43902,14 +43664,14 @@
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> d
     com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue() -> h
     boolean isNonConstantNumberValue() -> j
-com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.qH:
+com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.gH:
     1:1:void <init>():7:7 -> <init>
     long getAbstractionSize() -> E
     com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue() -> b
     boolean isNonConstantNumberValue() -> j
     com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue() -> k
     boolean isConstantOrNonConstantNumberValue() -> w
-com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.LH:
+com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.BH:
     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:com.android.tools.r8.ir.analysis.value.AbstractValue getNonNullValue():42:42 -> E
@@ -43934,7 +43696,7 @@
     70:70:java.lang.String toString():66:66 -> toString
     67:67:java.lang.String toString():66:66 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.RH:
+com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.HH:
     long maxInclusive -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():13:13 -> <clinit>
@@ -43963,7 +43725,7 @@
     1:2:int hashCode():93:94 -> hashCode
     1:1:java.lang.String toString():100:100 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.TH:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.JH:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -43986,7 +43748,7 @@
     1:1:int hashCode():106:106 -> hashCode
     1:7:java.lang.String toString():111:117 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.SH:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.IH:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():120:120 -> <clinit>
@@ -43995,7 +43757,7 @@
     1:4:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInt(int):133:136 -> a
     5:8:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInts(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):143:146 -> a
     9:17:com.android.tools.r8.ir.analysis.value.AbstractValue build(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):153:161 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.PU:
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.FU:
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
@@ -44041,24 +43803,24 @@
     1:1:int hashCode():60:60 -> hashCode
     com.android.tools.r8.ir.analysis.value.SingleConstClassValue asSingleConstClassValue() -> m
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":132,"2":133,"3":134}}
-    132:132:java.lang.String toString():65:65 -> toString
-    133:133:java.lang.String toString():65:65 -> toString
-    134:134:java.lang.String toString():65:65 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":68,"2":69,"3":70}}
+    68:68:java.lang.String toString():65:65 -> toString
+    69:69:java.lang.String toString():65:65 -> toString
+    70:70:java.lang.String toString():65:65 -> toString
     66:66:java.lang.String toString():65:65 -> toString
     67:67:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":135,"2":136,"3":137,"4":138}}
-    135:135:java.lang.String toString():65:65 -> toString
-    136:136:java.lang.String toString():65:65 -> toString
-    137:137:java.lang.String toString():65:65 -> toString
-    138:138:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.QU:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":68,"2":69,"3":70,"4":71}}
+    68:68:java.lang.String toString():65:65 -> toString
+    69:69:java.lang.String toString():65:65 -> toString
+    70:70:java.lang.String toString():65:65 -> toString
+    71:71:java.lang.String toString():65:65 -> toString
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.GU:
     1:1:void <init>():7:7 -> <init>
     boolean isSingleConstValue() -> A
     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,com.android.tools.r8.graph.GraphLens):30:30 -> 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,com.android.tools.r8.graph.GraphLens):30:30 -> b
     com.android.tools.r8.ir.analysis.value.SingleConstValue asSingleConstValue() -> n
-com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.SU:
+com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.IU:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
     com.android.tools.r8.graph.DexReference item -> c
@@ -44084,7 +43846,7 @@
     76:76:java.lang.String toString():73:73 -> toString
     77:77:java.lang.String toString():73:73 -> toString
     74:74:java.lang.String toString():73:73 -> toString
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.TU:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.JU:
     com.android.tools.r8.graph.DexField field -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():34:34 -> <clinit>
@@ -44123,7 +43885,7 @@
     1:11:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):145:155 -> c
     com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue() -> p
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState() -> t
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.UU:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.KU:
     long value -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():24:24 -> <clinit>
@@ -44165,7 +43927,7 @@
     126:126:java.lang.String toString():125:125 -> toString
     1:1:boolean isFalse():51:51 -> x
     1:1:boolean isSingleBoolean():46:46 -> z
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.WU:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.MU:
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():11:11 -> <clinit>
@@ -44185,7 +43947,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue.getObjectState():39:39 -> u
     1:1:boolean hasKnownArrayLength():24 -> u
     2:2:boolean hasKnownArrayLength():24:24 -> u
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.XU:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.NU:
     1:1:void <init>(com.android.tools.r8.graph.DexField):14:14 -> <init>
     1:5:boolean equals(java.lang.Object):34:38 -> equals
     1:1:int hashCode():43:43 -> hashCode
@@ -44198,7 +43960,7 @@
     33:33:java.lang.String toString():29:29 -> toString
     30:30:java.lang.String toString():29:29 -> toString
     boolean hasObjectState() -> v
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.YU:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.OU:
     com.android.tools.r8.graph.DexString string -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():26:26 -> <clinit>
@@ -44221,7 +43983,7 @@
     64:64:java.lang.String toString():61:61 -> toString
     65:65:java.lang.String toString():61:61 -> toString
     62:62:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.aV:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.QU:
     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
@@ -44232,7 +43994,7 @@
     boolean isSingleValue() -> f
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> i
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.bW:
+com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.RV:
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -44254,7 +44016,7 @@
     2:2:boolean hasKnownArrayLength():44:44 -> u
     boolean hasObjectState() -> v
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.K00:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.A00:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -44263,7 +44025,7 @@
     1:1:int hashCode():44:44 -> hashCode
     1:1:java.lang.String toString():49:49 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState -> com.android.tools.r8.internal.Yh:
+com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState -> com.android.tools.r8.internal.Th:
     com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -44273,7 +44035,7 @@
     boolean isEmpty() -> d
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState getInstance():23:23 -> e
     1:1:int hashCode():54:54 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState -> com.android.tools.r8.internal.Vi:
+com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState -> com.android.tools.r8.internal.Qi:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[] state -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -44290,7 +44052,7 @@
     1:1:int getEnumValuesSize():44:44 -> e
     1:9:boolean equals(java.lang.Object):85:93 -> equals
     1:1:int hashCode():102:102 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState -> com.android.tools.r8.internal.Uy:
+com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState -> com.android.tools.r8.internal.Ny:
     int length -> a
     1:2:void <init>(int):20:21 -> <init>
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
@@ -44300,7 +44062,7 @@
     boolean hasKnownArrayLength() -> c
     boolean isEmpty() -> d
     1:1:int hashCode():62:62 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.tH:
+com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.jH:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -44313,7 +44075,7 @@
     boolean isEmpty() -> d
     1:11:boolean equals(java.lang.Object):58:68 -> equals
     1:1:int hashCode():77:77 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.gK:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.WJ:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState asEnumValuesObjectState() -> a
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
@@ -44323,7 +44085,7 @@
     1:1:int getKnownArrayLength():68:68 -> b
     boolean hasKnownArrayLength() -> c
     boolean isEmpty() -> d
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.fK:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.VJ:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():79:79 -> <clinit>
@@ -44333,7 +44095,7 @@
     5:5:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.empty():28:28 -> a
     5:5:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState build():91 -> a
     6:6:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState build():91:91 -> a
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.hK:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.XJ:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:boolean lambda$computeObjectState$0(com.android.tools.r8.ir.code.Instruction):25:25 -> a
@@ -44360,10 +44122,10 @@
     19:19:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):68 -> a
     20:43:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeNewInstanceObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):69:92 -> a
     44:45:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):78:79 -> a
-    46:46:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1743:1743 -> a
+    46:46:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1741:1741 -> a
     46:46:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    47:47:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1743:1743 -> a
+    47:47:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1741:1741 -> a
     47:47:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):79 -> a
     48:55:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):82:89 -> a
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):23:23 -> b
@@ -44473,7 +44235,7 @@
     com.android.tools.r8.ir.code.And asAnd() -> m
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> r2
-com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.internal.I2:
+com.android.tools.r8.ir.code.Argument -> com.android.tools.r8.internal.H2:
     int $r8$clinit -> l
     boolean knownToBeBoolean -> j
     boolean $assertionsDisabled -> k
@@ -44483,34 +44245,32 @@
     boolean hasInvariantOutType() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArgument():74:74 -> a
-    1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):119 -> a
-    2:2:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):82:82 -> a
-    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):98:98 -> a
-    4:4:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):129:129 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):134:134 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):139:139 -> a
-    7:7:boolean outTypeKnownToBeBoolean(java.util.Set):149:149 -> a
-    1:1:int getIndex(boolean):48:48 -> b
-    2:7:boolean com.android.tools.r8.ir.code.Argument.verifyIndex():54:59 -> b
-    2:7:int getIndex(boolean):48 -> b
-    8:9:int getIndex(boolean):48:49 -> b
-    10:10:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):103:103 -> b
+    1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):74:74 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArgument():74:74 -> a
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):111 -> a
+    3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):90:90 -> a
+    4:4:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):121:121 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):126:126 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):131:131 -> a
+    7:7:boolean outTypeKnownToBeBoolean(java.util.Set):141:141 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):95:95 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isArgument() -> g1
-    1:1:int maxInValueRegister():87:87 -> h2
+    1:1:int maxInValueRegister():79:79 -> h2
     int maxOutValueRegister() -> i2
     int opcode() -> j2
     1:1:int getIndex():40:40 -> m2
+    2:7:boolean com.android.tools.r8.ir.code.Argument.verifyIndex():46:51 -> m2
+    2:7:int getIndex():40 -> m2
+    8:9:int getIndex():40:41 -> m2
     com.android.tools.r8.ir.code.Argument asArgument() -> n
-    1:1:int getIndexRaw():44:44 -> n2
-com.android.tools.r8.ir.code.Argument$Builder -> com.android.tools.r8.internal.H2:
+com.android.tools.r8.ir.code.Argument$Builder -> com.android.tools.r8.internal.G2:
     int index -> c
-    1:1:void <init>():157:157 -> <init>
+    1:1:void <init>():149:149 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
-    1:1:com.android.tools.r8.ir.code.Argument$Builder setIndex(int):163:163 -> a
-    1:1:com.android.tools.r8.ir.code.Argument build():169:169 -> b
-com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.f3:
+    1:1:com.android.tools.r8.ir.code.Argument$Builder setIndex(int):155:155 -> a
+    1:1:com.android.tools.r8.ir.code.Argument build():161:161 -> b
+com.android.tools.r8.ir.code.ArithmeticBinop -> com.android.tools.r8.internal.e3:
     boolean $assertionsDisabled -> j
     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>
@@ -44563,10 +44323,10 @@
     boolean isArithmeticBinop() -> h1
     com.android.tools.r8.ir.code.ArithmeticBinop asArithmeticBinop() -> o
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode() -> r2
-com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.e3:
+com.android.tools.r8.ir.code.ArithmeticBinop$1 -> com.android.tools.r8.internal.d3:
     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.g3:
+com.android.tools.r8.ir.code.ArrayAccess -> com.android.tools.r8.internal.f3:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):16:16 -> <init>
     1:1:boolean instructionInstanceCanThrow():53:53 -> b1
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b1
@@ -44578,7 +44338,7 @@
     1:1:com.android.tools.r8.ir.code.Value index():24:24 -> n2
     com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType) -> o2
     com.android.tools.r8.ir.code.ArrayAccess asArrayAccess() -> p
-com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.j3:
+com.android.tools.r8.ir.code.ArrayGet -> com.android.tools.r8.internal.i3:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.MemberType type -> i
     1:1:void <clinit>():35:35 -> <clinit>
@@ -44698,7 +44458,7 @@
     boolean throwsOnNullInput() -> l2
     1:269:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):0:268 -> o2
     com.android.tools.r8.ir.code.ArrayGet asArrayGet() -> q
-com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.k3:
+com.android.tools.r8.ir.code.ArrayLength -> com.android.tools.r8.internal.j3:
     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 -> O0
     boolean hasInvariantOutType() -> V0
@@ -44726,7 +44486,7 @@
     boolean throwsOnNullInput() -> l2
     1:1:com.android.tools.r8.ir.code.Value array():40:40 -> m2
     com.android.tools.r8.ir.code.ArrayLength asArrayLength() -> r
-com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.n3:
+com.android.tools.r8.ir.code.ArrayPut -> com.android.tools.r8.internal.m3:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.MemberType type -> i
     1:1:void <clinit>():29:29 -> <clinit>
@@ -44783,7 +44543,7 @@
     1:247:com.android.tools.r8.ir.code.ArrayAccess withMemberType(com.android.tools.r8.ir.code.MemberType):0:246 -> o2
     com.android.tools.r8.ir.code.ArrayPut asArrayPut() -> s
     1:1:com.android.tools.r8.ir.code.Value value():55:55 -> value
-com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.G3:
+com.android.tools.r8.ir.code.Assume -> com.android.tools.r8.internal.F3:
     com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption dynamicTypeAssumption -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.ir.code.Instruction origin -> k
@@ -44823,7 +44583,7 @@
     1:1:void unsetDynamicTypeAssumption():122:122 -> r2
     com.android.tools.r8.ir.code.Assume asAssume() -> t
     1:16:java.lang.String toString():272:287 -> toString
-com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.E3:
+com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption -> com.android.tools.r8.internal.D3:
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound dynamicType -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():290:290 -> <clinit>
@@ -44833,14 +44593,14 @@
     7:7:boolean verifyCorrectnessOfValues(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):306:306 -> a
     1:5:boolean equals(java.lang.Object):317:321 -> equals
     1:1:int hashCode():326:326 -> hashCode
-com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.F3:
+com.android.tools.r8.ir.code.Assume$NonNullAssumption -> com.android.tools.r8.internal.E3:
     com.android.tools.r8.ir.code.Assume$NonNullAssumption instance -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():330:332 -> <clinit>
     1:1:void <init>():334:334 -> <init>
     1:1:com.android.tools.r8.ir.code.Assume$NonNullAssumption get():337:337 -> 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):341:341 -> a
-com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.H3:
+com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration -> com.android.tools.r8.internal.G3:
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():9:11 -> <clinit>
@@ -44858,7 +44618,7 @@
     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.z4:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.y4:
     int color -> n
     int estimatedPredecessorsCount -> l
     int unfilledPredecessorsCount -> m
@@ -44918,16 +44678,16 @@
     5220:5220:java.lang.String toDetailedString():1265:1265 -> Z
     1267:1269:java.lang.String toDetailedString():1266:1268 -> Z
     1270:1270:java.lang.String toDetailedString():0:0 -> Z
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5224,"2":5225,"3":5226}}
-    5224:5224:java.lang.String toDetailedString():1269:1269 -> Z
-    5225:5225:java.lang.String toDetailedString():1269:1269 -> Z
-    5226:5226:java.lang.String toDetailedString():1269:1269 -> Z
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5218,"2":5219,"3":5220}}
+    5218:5218:java.lang.String toDetailedString():1269:1269 -> Z
+    5219:5219:java.lang.String toDetailedString():1269:1269 -> Z
+    5220:5220:java.lang.String toDetailedString():1269:1269 -> Z
     2539:2539:java.lang.String toDetailedString():1269:1269 -> Z
     2540:2540:java.lang.String toDetailedString():0:0 -> Z
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5228,"2":5229,"3":5230}}
-    5228:5228:java.lang.String toDetailedString():1271:1271 -> Z
-    5229:5229:java.lang.String toDetailedString():1271:1271 -> Z
-    5230:5230:java.lang.String toDetailedString():1271:1271 -> Z
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5218,"2":5219,"3":5220}}
+    5218:5218:java.lang.String toDetailedString():1271:1271 -> Z
+    5219:5219:java.lang.String toDetailedString():1271:1271 -> Z
+    5220:5220:java.lang.String toDetailedString():1271:1271 -> Z
     3811:3812:java.lang.String toDetailedString():1271:1272 -> Z
     3813:3813:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():614:614 -> Z
     3813:3813:java.lang.String toDetailedString():1272 -> Z
@@ -44945,180 +44705,190 @@
     3871:3871:java.lang.String toDetailedString():1310 -> Z
     3872:3882:java.lang.String toDetailedString():1310:1320 -> Z
     3883:3883:java.lang.String toDetailedString():0:0 -> Z
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5281,"2":5282,"3":5283}}
-    5281:5281:java.lang.String toDetailedString():1322:1322 -> Z
-    5282:5282:java.lang.String toDetailedString():1322:1322 -> Z
-    5283:5283:java.lang.String toDetailedString():1322:1322 -> Z
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5218,"2":5219,"3":5220}}
+    5218:5218:java.lang.String toDetailedString():1322:1322 -> Z
+    5219:5219:java.lang.String toDetailedString():1322:1322 -> Z
+    5220:5220:java.lang.String toDetailedString():1322:1322 -> Z
     5205:5217:java.lang.String toDetailedString():1322:1334 -> Z
     1:4:boolean consistentInitClassInstruction(com.android.tools.r8.ir.code.InitClass,boolean):93:96 -> a
     5:7:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):101:101 -> 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):102:102 -> a
     9:9:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):107:107 -> a
-    10:12:void replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> a
-    13:17:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):201:205 -> a
-    18:36:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):330:348 -> a
-    37:54:void swapSuccessorsByIndex(int,int):377:394 -> a
-    55:62:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):511:518 -> a
-    63:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):522:525 -> a
-    67:67:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):245:245 -> a
+    10:14:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):201:205 -> a
+    15:33:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):330:348 -> a
+    34:51:void swapSuccessorsByIndex(int,int):377:394 -> a
+    52:59:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):511:518 -> a
+    60:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):522:525 -> a
+    64:64:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):245:245 -> a
+    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
+    65:66:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606:606 -> a
+    65:66:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):32 -> a
+    65:66:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):246 -> a
+    65:66:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
+    67:67:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):246:246 -> a
     67:67:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
-    68:69:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606:606 -> a
-    68:69:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):32 -> a
-    68:69:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):246 -> a
-    68:69:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
-    70:70:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):246:246 -> a
-    70:70:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
-    71:74:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525:528 -> a
-    75:75:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
-    75:75:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    75:75:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530 -> a
-    76:76:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530:530 -> a
-    77:77:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
-    77:77:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    77:77:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530 -> a
-    78:96:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530:548 -> a
-    97:97:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
-    97:97:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
-    97:97:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550 -> a
-    98:98:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550:550 -> a
-    99:99:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
-    99:99:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
-    99:99:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550 -> a
-    100:116:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550:566 -> a
-    117:118:boolean hasDeadPhi(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):597:598 -> a
-    119:119:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):657:657 -> a
-    120:121:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):734:735 -> a
-    122:124:void clearMark(int):747:749 -> a
-    125:125:void addPhi(com.android.tools.r8.ir.code.Phi):779:779 -> a
-    126:126:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793:793 -> a
-    127:127:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():614:614 -> a
-    127:127:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793 -> a
-    128:131:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793:796 -> a
-    132:132:void close(com.android.tools.r8.ir.conversion.IRBuilder):800:800 -> a
-    133:133:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():614:614 -> a
-    133:133:void close(com.android.tools.r8.ir.conversion.IRBuilder):800 -> a
-    134:138:void close(com.android.tools.r8.ir.conversion.IRBuilder):800:804 -> a
-    139:140:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1665:1666 -> a
-    139:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
-    141:141:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1683:1683 -> a
-    141:141:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1666 -> a
-    141:141:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
-    142:147:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1667:1672 -> a
-    142:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
-    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):806:806 -> a
-    149:149:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1170:1170 -> a
+    68:71:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525:528 -> 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):530 -> a
+    73:73:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530:530 -> a
+    74:74:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
+    74:74:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
+    74:74:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530 -> a
+    75:93:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):530:548 -> a
+    94:94:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> a
+    94:94:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180 -> a
+    94:94:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550 -> a
+    95:95:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550:550 -> a
+    96:96:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
+    96:96:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
+    96:96:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550 -> a
+    97:113:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):550:566 -> a
+    114:115:boolean hasDeadPhi(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):597:598 -> a
+    116:116:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):657:657 -> a
+    117:118:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):734:735 -> a
+    119:121:void clearMark(int):747:749 -> a
+    122:122:void addPhi(com.android.tools.r8.ir.code.Phi):779:779 -> a
+    123:123:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793:793 -> a
+    124:124:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():614:614 -> a
+    124:124:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793 -> a
+    125:128:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):793:796 -> a
+    129:129:void close(com.android.tools.r8.ir.conversion.IRBuilder):800:800 -> a
+    130:130:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():614:614 -> a
+    130:130:void close(com.android.tools.r8.ir.conversion.IRBuilder):800 -> a
+    131:135:void close(com.android.tools.r8.ir.conversion.IRBuilder):800:804 -> a
+    136:137:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1665:1666 -> a
+    136:137:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
+    138:138:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1683:1683 -> a
+    138:138:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1666 -> a
+    138:138:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
+    139:144:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1667:1672 -> a
+    139:144:void close(com.android.tools.r8.ir.conversion.IRBuilder):805 -> a
+    145:145:void close(com.android.tools.r8.ir.conversion.IRBuilder):806:806 -> a
+    146:146:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1170:1170 -> a
+    146:146:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
+    147:147:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1170:1170 -> a
+    147:147:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    148:148:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1170:1170 -> a
+    148:148:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
+    149:149:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1171:1171 -> a
     149:149:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
-    150:150:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1170:1170 -> a
-    150:150:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    151:151:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1170:1170 -> a
-    151:151:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
-    152:152:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1171:1171 -> a
-    152:152:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
+    150:160:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1171:1181 -> a
+    150:160:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
+    161:161:boolean blocksClean(java.util.List):819:819 -> a
+    162:171:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):899:908 -> a
+    172:172:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):905:905 -> a
+    173:177:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):934:938 -> a
+    178:178:java.util.List com.android.tools.r8.ir.code.DominatorTree.dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):171:171 -> a
+    178:178:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):939 -> a
+    179:183:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):939:943 -> a
+    184:193:void linkCatchSuccessors(java.util.List,java.util.List):982:991 -> a
+    194:225:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):995:1026 -> a
+    226:236:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1037:1047 -> a
+    237:238:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
+    237:238:boolean com.android.tools.r8.ir.code.BasicBlock.isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1104 -> a
+    237:238:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1215 -> a
+    239:240:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1218:1219 -> a
+    241:242:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
+    241:242:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1110 -> a
+    243:245:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1112:1114 -> a
+    246:247:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
+    246:247:boolean com.android.tools.r8.ir.code.BasicBlock.isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1104 -> a
+    246:247:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1135 -> a
+    248:252:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1141:1145 -> a
+    253:254:boolean com.android.tools.r8.ir.code.BasicBlock.verifyOnThrowWrite(int):1655:1656 -> a
+    253:254:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1145 -> a
+    255:262:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1146:1153 -> a
+    263:264:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1161:1162 -> a
+    265:266:boolean com.android.tools.r8.ir.code.BasicBlock.verifyOnThrowWrite(int):1655:1656 -> a
+    265:266:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1162 -> a
+    267:269:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1163:1163 -> a
+    272:272:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1166:1166 -> a
+    273:278:void print(com.android.tools.r8.utils.CfgPrinter):1338:1343 -> a
+    279:280:void com.android.tools.r8.ir.code.BasicBlock.printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1374:1375 -> a
+    279:280:void print(com.android.tools.r8.utils.CfgPrinter):1343 -> a
+    281:283:void print(com.android.tools.r8.utils.CfgPrinter):1344:1346 -> a
+    284:285:void com.android.tools.r8.ir.code.BasicBlock.printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1374:1375 -> a
+    284:285:void print(com.android.tools.r8.utils.CfgPrinter):1346 -> a
+    286:309:void print(com.android.tools.r8.utils.CfgPrinter):1347:1370 -> a
+    310:311: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):1433:1434 -> a
+    312:316:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1447:1451 -> a
+    317:326: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):1504:1513 -> a
+    327:327:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
+    327:327:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1514 -> a
+    328:328:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
+    328:328:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1515 -> a
+    329:329:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1516:1516 -> a
+    330:330:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    330:330: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):1517 -> a
+    331: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):1517:1517 -> a
+    332:333:boolean canThrow():1642:1643 -> a
+    334:334:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1691:1691 -> a
+    335:335:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.BasicBlock.listIterator(com.android.tools.r8.ir.code.IRMetadata):1695:1695 -> a
+    335:335:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1691 -> a
+    336:336:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1695:1695 -> a
+    337:337:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1699:1699 -> a
+    338:338:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1710:1710 -> a
+    339:350:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1728:1739 -> a
+    351:356:void com.android.tools.r8.ir.code.BasicBlock.moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1760:1765 -> a
+    351:356:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1743 -> a
+    357:361:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1747:1751 -> a
+    362:377:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1776:1791 -> a
+    378:378: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:1811 -> a
+    378:378:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    153:163:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1171:1181 -> a
-    153:163:void close(com.android.tools.r8.ir.conversion.IRBuilder):807 -> a
-    164:164:boolean blocksClean(java.util.List):819:819 -> a
-    165:174:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):899:908 -> a
-    175:175:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):905:905 -> a
-    176:180:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):934:938 -> a
-    181:181:java.util.List com.android.tools.r8.ir.code.DominatorTree.dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):171:171 -> a
-    181:181:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):939 -> a
-    182:186:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):939:943 -> a
-    187:196:void linkCatchSuccessors(java.util.List,java.util.List):982:991 -> a
-    197:228:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):995:1026 -> a
-    229:239:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1037:1047 -> a
-    240:241:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
-    240:241:boolean com.android.tools.r8.ir.code.BasicBlock.isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1104 -> a
-    240:241:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1215 -> a
-    242:243:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1218:1219 -> a
-    244:245:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
-    244:245:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1110 -> a
-    246:248:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1112:1114 -> a
-    249:250:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1097:1098 -> a
-    249:250:boolean com.android.tools.r8.ir.code.BasicBlock.isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1104 -> a
-    249:250:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1135 -> a
-    251:255:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1141:1145 -> a
-    256:257:boolean com.android.tools.r8.ir.code.BasicBlock.verifyOnThrowWrite(int):1655:1656 -> a
-    256:257:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1145 -> a
-    258:265:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1146:1153 -> a
-    266:267:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1161:1162 -> a
-    268:269:boolean com.android.tools.r8.ir.code.BasicBlock.verifyOnThrowWrite(int):1655:1656 -> a
-    268:269:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1162 -> a
-    270:272:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1163:1163 -> a
-    275:275:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1166:1166 -> a
-    276:281:void print(com.android.tools.r8.utils.CfgPrinter):1338:1343 -> a
-    282:283:void com.android.tools.r8.ir.code.BasicBlock.printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1374:1375 -> a
-    282:283:void print(com.android.tools.r8.utils.CfgPrinter):1343 -> a
-    284:286:void print(com.android.tools.r8.utils.CfgPrinter):1344:1346 -> a
-    287:288:void com.android.tools.r8.ir.code.BasicBlock.printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1374:1375 -> a
-    287:288:void print(com.android.tools.r8.utils.CfgPrinter):1346 -> a
-    289:312:void print(com.android.tools.r8.utils.CfgPrinter):1347:1370 -> a
-    313:314: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):1433:1434 -> a
-    315:319:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1447:1451 -> a
-    320:329:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1504:1513 -> a
-    330:330:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
-    330:330: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
-    331:331:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
-    331: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):1515 -> 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):1516:1516 -> a
-    333:333:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> 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):1517 -> 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):1517:1517 -> a
-    335:336:boolean canThrow():1642:1643 -> a
-    337:337:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1691:1691 -> a
-    338:338:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.BasicBlock.listIterator(com.android.tools.r8.ir.code.IRMetadata):1695:1695 -> a
-    338:338:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1691 -> a
-    339:339:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1695:1695 -> a
-    340:340:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1699:1699 -> a
-    341:341:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1710:1710 -> a
-    342:353:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1728:1739 -> a
-    354:359:void com.android.tools.r8.ir.code.BasicBlock.moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1760:1765 -> a
-    354:359:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1743 -> a
-    360:364:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1747:1751 -> a
-    365:380:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1776:1791 -> a
-    381:381: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:1811 -> a
-    381:381:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    379:379: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):1812:1812 -> a
+    379:379:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    380:380:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    380:380: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):1812 -> a
+    380:380:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    381:398: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):1816:1833 -> a
+    381:398:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    399:399:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    399:399: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):1834 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    382:382: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):1812:1812 -> a
-    382: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):1792 -> a
-    383:383:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    383:383: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):1812 -> a
-    383:383:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
-    384:401: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):1816:1833 -> a
-    384:401:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
-    402:402:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    402:402: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):1834 -> a
+    399:399:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    400:400:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    400:400: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):1834 -> a
+    400:400:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    401:407: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):1834:1840 -> a
+    401:407:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    408:408:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
+    408:408: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
+    408:408:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    409: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):1842:1845 -> a
+    409: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):1792 -> a
+    413:413:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
+    413:413: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 -> a
+    413:413:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    414:419: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):1847:1852 -> a
+    414:419:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    420:420: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):1830:1830 -> a
+    420:420:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    421:421:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    421:421: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):1830 -> a
+    421:421:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    422:422:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    422:422:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    422:422: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):1830 -> a
+    422:422:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    423:460: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):1830:1867 -> a
+    423:460:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
+    461:534:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1883:1956 -> a
+    1:2:void unlinkCatchHandler():872:873 -> a0
+    3:3:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):324:324 -> a0
+    3:3:void unlinkCatchHandler():873 -> a0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    402:402:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
-    403:403:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    403: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):1834 -> a
-    403: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):1792 -> a
-    404:410: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):1834:1840 -> a
-    404:410:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
-    411:411:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
-    411: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):1841 -> a
-    411: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):1792 -> a
-    412:415: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:1845 -> a
-    412:415:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
-    416:416:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):789:789 -> a
-    416: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):1846 -> a
-    416: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):1792 -> a
-    417:422: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):1847:1852 -> a
-    417:422:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
-    423: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):1830:1830 -> a
-    423:423:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1792 -> a
-    424:424:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> 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):1830 -> 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):1792 -> a
-    425:425:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    425:425:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):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):1830 -> 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):1792 -> 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):1830:1867 -> 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):1792 -> a
-    464:537:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1883:1956 -> a
-    1:3:void unlinkCatchHandler():872:874 -> a0
+    4:6:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):324:326 -> a0
+    4:6:void unlinkCatchHandler():873 -> a0
+    7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> a0
+    7:7:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326 -> a0
+    7:7:void unlinkCatchHandler():873 -> a0
+    8:8:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326:326 -> a0
+    8:8:void unlinkCatchHandler():873 -> a0
+    9:9:void unlinkCatchHandler():874:874 -> a0
     1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):308:308 -> b
     2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):399:429 -> b
     33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> b
@@ -45150,8 +44920,19 @@
     549:553:boolean com.android.tools.r8.ir.code.BasicBlock.isCatchHandlerForSingleGuard():913:917 -> b
     549:553:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):888 -> b
     554:558:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):890:894 -> b
-    559:586:java.util.Set cleanForRemoval():948:975 -> b
-    587:588:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1186:1187 -> b
+    559:565:java.util.Set cleanForRemoval():948:954 -> b
+    566:566:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):324:324 -> b
+    566:566:java.util.Set cleanForRemoval():955 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    567:569:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):324:326 -> b
+    567:569:java.util.Set cleanForRemoval():955 -> b
+    570:570:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> b
+    570:570:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326 -> b
+    570:570:java.util.Set cleanForRemoval():955 -> b
+    571:571:void com.android.tools.r8.ir.code.BasicBlock.removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326:326 -> b
+    571:571:java.util.Set cleanForRemoval():955 -> b
+    572:590:java.util.Set cleanForRemoval():957:975 -> b
+    591:592:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1186:1187 -> b
     1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():833:837 -> b0
     1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):245:245 -> c
     2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):369:373 -> c
@@ -45195,23 +44976,19 @@
     7:15:int com.android.tools.r8.ir.code.BasicBlock.guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1198:1206 -> i
     7:15:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1254 -> i
     16:18:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1254:1256 -> i
-    1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):324:326 -> j
-    4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> j
-    4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326 -> j
-    5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):326:326 -> j
-    6:6:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1563:1563 -> j
-    7:7:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1572,"2":1573,"3":1574}}
-    1572:1572:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
-    1573:1573:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
-    1574:1574:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
-    8:8:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1575,"2":1576,"3":1577}}
-    1575:1575:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
-    1576:1576:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
-    1577:1577:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
+    1:1:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1563:1563 -> j
+    2:2:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> j
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1567,"2":1568,"3":1569}}
+    1567:1567:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
+    1568:1568:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
+    1569:1569:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1564:1564 -> j
+    3:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():0:0 -> j
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1570,"2":1571,"3":1572}}
+    1570:1570:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
+    1571:1571:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
+    1572:1572:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1565:1565 -> j
+    1573:1574:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1623:1624 -> j
     1:1:com.android.tools.r8.ir.code.Instruction entry():707:707 -> k
-    2:3:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1623:1624 -> k
     1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():717:718 -> l
     3:3:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1683:1683 -> l
     3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():718 -> l
@@ -45240,7 +45017,7 @@
     1:1:java.util.List getPhis():606:606 -> x
     1:1:java.util.List getPredecessors():298:298 -> y
     1:1:java.util.List getSuccessors():235:235 -> z
-com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.u4:
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.t4:
     com.android.tools.r8.ir.code.Instruction next -> c
     com.android.tools.r8.ir.code.Instruction val$instruction -> d
     com.android.tools.r8.ir.code.InstructionIterator iterator -> b
@@ -45251,14 +45028,14 @@
     1:5:java.lang.Object next():662 -> next
     6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():686:686 -> next
     6:6:java.lang.Object next():662 -> next
-com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.v4:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.w4:
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.u4:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.v4:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> d
     1:3:void <clinit>():134:136 -> <clinit>
     1:1:void <init>(java.lang.String,int):133:133 -> <init>
-com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.x4:
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.w4:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():1986:1986 -> <clinit>
     1:1:void <init>():1986:1986 -> <init>
@@ -45269,15 +45046,15 @@
     5:5:int doHash(java.lang.Object):1986:1986 -> a
     6:7:int com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doHash(com.android.tools.r8.ir.code.Phi):2001:2002 -> a
     6:7:int doHash(java.lang.Object):1986 -> a
-com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.y4:
+com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.x4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> 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):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForConstString(com.android.tools.r8.utils.InternalOptions):125 -> a
-com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.B4:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.A4:
     java.util.ListIterator instructionIterator -> b
     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>
@@ -45288,7 +45065,7 @@
     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.C4:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.B4:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.Instruction current -> d
     boolean $assertionsDisabled -> g
@@ -45324,154 +45101,160 @@
     46:46:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1663:1663 -> a
     46:46:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):291 -> a
     47:51:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):291:295 -> a
-    52:79:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):303:330 -> a
-    80:80:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    80:80:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):330 -> a
-    81:83:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):340:342 -> a
-    84:84:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
-    84:84:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):342 -> a
-    85:108:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):342:365 -> a
-    109:109:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    109:109:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):366 -> a
-    110:110:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):367:367 -> a
-    111:115:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):375:379 -> a
-    116:116: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):436:436 -> a
-    116:116:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):379 -> a
-    117:118:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):380:381 -> a
-    119:119:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
-    119:119:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):381 -> a
-    120:120:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    120:120:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):382 -> a
-    121:121:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):376:376 -> a
-    122:126:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):387:391 -> a
-    127:127:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    127:127:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):391 -> a
-    128:131:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):391:394 -> a
-    132:132:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    132:132:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):395 -> a
-    133:133:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):388:388 -> a
-    134:142:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):413:421 -> a
-    143:143:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    143:143:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):422 -> a
-    144:145:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):425:426 -> a
-    146:146:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):414:414 -> a
-    147:175:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):438:466 -> a
-    176:176:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):465:465 -> a
-    177:194:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):464:481 -> a
-    195:195:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
-    195:195:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):482 -> a
-    196:200:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):483:487 -> a
-    201:201:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
-    201:201:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):488 -> a
-    202:204:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):488:490 -> a
-    205:205:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):439:439 -> a
-    206:226:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):500:520 -> a
-    227:227:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():68:68 -> a
-    227:227:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):525 -> a
-    228:234:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):525:531 -> a
-    235:235:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):530:530 -> a
-    236:259:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):529:552 -> a
-    260:260:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
-    260:260:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):553 -> a
-    261:267:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):554:560 -> a
-    268:268:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
-    268:268:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):561 -> a
-    269:296:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):561:588 -> a
-    297:297:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):501:501 -> a
-    298:307:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):572:581 -> a
-    308:309:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):596:597 -> a
-    310:310:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():68:68 -> a
-    310:310:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):600 -> a
-    311:314:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):600:603 -> a
-    315:315:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
-    315:315:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):603 -> a
+    52:61:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):303:312 -> a
+    62:62:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):300:300 -> a
+    62:62:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):313 -> a
+    63:63:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    63:63:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):300 -> a
+    63:63:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):313 -> a
+    64:77:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):317:330 -> a
+    78:78:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    78:78:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):330 -> a
+    79:81:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):340:342 -> a
+    82:82:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
+    82:82:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):342 -> a
+    83:106:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):342:365 -> a
+    107:107:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    107:107:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):366 -> a
+    108:108:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):367:367 -> a
+    109:113:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):375:379 -> a
+    114:114: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):436:436 -> a
+    114:114:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):379 -> a
+    115:116:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):380:381 -> a
+    117:117:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> a
+    117:117:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):381 -> a
+    118:118:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    118:118:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):382 -> a
+    119:119:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):376:376 -> a
+    120:124:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):387:391 -> a
+    125:125:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    125:125:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):391 -> a
+    126:129:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):391:394 -> a
+    130:130:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    130:130:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):395 -> a
+    131:131:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):388:388 -> a
+    132:140:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):413:421 -> a
+    141:141:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    141:141:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):422 -> a
+    142:143:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):425:426 -> a
+    144:144:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):414:414 -> a
+    145:173:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):438:466 -> a
+    174:174:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):465:465 -> a
+    175:192:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):464:481 -> a
+    193:193:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
+    193:193:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):482 -> a
+    194:198:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):483:487 -> a
+    199:199:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
+    199:199:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):488 -> a
+    200:202:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):488:490 -> a
+    203:203:void replaceCurrentInstructionWithThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):439:439 -> a
+    204:224:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):500:520 -> a
+    225:225:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():68:68 -> a
+    225:225:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):525 -> a
+    226:232:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):525:531 -> a
+    233:233:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):530:530 -> a
+    234:257:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):529:552 -> a
+    258:258:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
+    258:258:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):553 -> a
+    259:265:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):554:560 -> a
+    266:266:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
+    266:266:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):561 -> a
+    267:294:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):561:588 -> a
+    295:295:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):501:501 -> a
+    296:305:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):572:581 -> a
+    306:307:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):596:597 -> a
+    308:308:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():68:68 -> a
+    308:308:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):600 -> a
+    309:312:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):600:603 -> a
+    313:313:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    313:313:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):603 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    316:316:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
-    316:316:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):603 -> a
-    317:317:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):607:607 -> a
-    318:318:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    318:318:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):607 -> a
-    319:322:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):607:610 -> a
-    323:324:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    323:324:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):610 -> a
-    325:343:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):611:629 -> a
-    344:351:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):638:645 -> a
-    352:355:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):653:656 -> a
-    356:388:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):682:714 -> a
-    389:394:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):752:757 -> a
-    395:402:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):768:775 -> a
-    403:405:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):774:776 -> a
-    406:408:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):662:664 -> a
-    406:408:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):778 -> a
-    409:425:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):782:798 -> a
-    426:426:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    426:426:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):799 -> a
+    314:314:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    314:314:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):603 -> a
+    315:315:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):607:607 -> a
+    316:316:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    316:316:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):607 -> a
+    317:320:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):607:610 -> a
+    321:322:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    321:322:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):610 -> a
+    323:341:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):611:629 -> a
+    342:349:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):638:645 -> a
+    350:353:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):653:656 -> a
+    354:386:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):682:714 -> a
+    387:392:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):752:757 -> a
+    393:400:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):768:775 -> a
+    401:403:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):774:776 -> a
+    404:406:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):662:664 -> a
+    404:406:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):778 -> a
+    407:423:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):782:798 -> a
+    424:424:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    424:424:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):799 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    427:434:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):799:806 -> a
-    435:435:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    435:435:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):809 -> a
+    425:432:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):799:806 -> a
+    433:433:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    433:433:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):809 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    436:472:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):809:845 -> a
-    473:473:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    473:473:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):849 -> a
+    434:470:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):809:845 -> a
+    471:471:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    471:471:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):849 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    474:478:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):849:853 -> a
-    479:479:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
-    479:479:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):854 -> a
-    480:487:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):854:861 -> a
-    488:488:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    488:488:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):861 -> a
-    489:508:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):861:880 -> a
-    509:509:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    509:509:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):880 -> a
-    510:510:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):883:883 -> a
-    511:511:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    511:511:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):882 -> a
-    512:545:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):881:914 -> a
-    546:546:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1060:1060 -> a
-    546:546:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):914 -> a
-    547:553:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):917:923 -> a
-    554:554:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    554:554:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):924 -> a
-    555:560:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):924:929 -> a
-    561:577:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):729:745 -> a
-    561:577:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):930 -> a
-    578:583:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):937:942 -> a
-    584:584:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    584:584:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):942 -> a
-    585:595:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):942:952 -> a
-    596:600:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):951:955 -> a
-    601:607:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):961:967 -> a
-    608:608:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    608:608:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):968 -> a
+    472:476:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):849:853 -> a
+    477:477:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
+    477:477:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):854 -> a
+    478:485:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):854:861 -> a
+    486:486:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    486:486:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):861 -> a
+    487:506:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):861:880 -> a
+    507:507:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    507:507:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):880 -> a
+    508:508:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):883:883 -> a
+    509:509:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    509:509:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):882 -> a
+    510:543:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):881:914 -> a
+    544:544:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1060:1060 -> a
+    544:544:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):914 -> a
+    545:551:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):917:923 -> a
+    552:552:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    552:552:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):924 -> a
+    553:558:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):924:929 -> a
+    559:575:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):729:745 -> a
+    559:575:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):930 -> a
+    576:581:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):937:942 -> a
+    582:582:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    582:582:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):942 -> a
+    583:593:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):942:952 -> a
+    594:598:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexProgramClass):951:955 -> a
+    599:605:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):961:967 -> a
+    606:606:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    606:606:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):968 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    609:609:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    609:609:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):968 -> a
-    610:635:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):968:993 -> a
-    636:636:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    636:636:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):993 -> a
-    637:654:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):993:1010 -> a
-    655:655:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1158:1158 -> a
-    655:655: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):253 -> a
+    607:607:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    607:607:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):968 -> a
+    608:633:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):968:993 -> a
+    634:634:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    634:634:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):993 -> a
+    635:652:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):993:1010 -> a
+    653:653:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1158:1158 -> a
+    653:653: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):253 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    656:656:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
-    656:656: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):255 -> a
-    657:658: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:258 -> a
-    659:659:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
-    659:659: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):258 -> a
+    654:654:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():100:100 -> a
+    654:654: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):255 -> a
+    655:656: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:258 -> a
+    657:657:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    657:657: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):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    660:660:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
-    660:660: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):258 -> a
-    661:666: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):260:265 -> a
-    667:667:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1186:1186 -> a
-    667:667:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):270 -> a
+    658:658:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    658:658: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):258 -> a
+    659:664: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):260:265 -> a
+    665:665:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1186:1186 -> a
+    665:665:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):270 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    668:669:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1191:1192 -> a
-    668:669:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1186 -> a
-    668:669:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):270 -> a
+    666:667:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1191:1192 -> a
+    666:667:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1186 -> a
+    666:667:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):270 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    670:670:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):273:273 -> a
-    671:674:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):272:275 -> a
+    668:668:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):273:273 -> a
+    669:672:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):272:275 -> a
     1:1:void add(java.lang.Object):39:39 -> add
     1:7:void add(com.android.tools.r8.ir.code.Instruction):123:129 -> b
     8:13:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):401:406 -> b
@@ -45508,7 +45291,7 @@
     1:1:void set(java.lang.Object):39:39 -> set
     2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):162:165 -> set
     2:5:void set(java.lang.Object):39 -> set
-com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.E4:
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.D4:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.BasicBlock current -> d
@@ -45530,7 +45313,7 @@
     1:1:void set(java.lang.Object):11:11 -> set
     2:2:void com.android.tools.r8.ir.code.BasicBlockIterator.set(com.android.tools.r8.ir.code.BasicBlock):78:78 -> set
     2:2:void set(java.lang.Object):11 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.Z4:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.Y4:
     com.android.tools.r8.ir.code.NumericType type -> i
     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() -> V0
@@ -45557,7 +45340,7 @@
     1:2:int maxInOutValueRegisterSize():82:83 -> p2
     1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> q2
     com.android.tools.r8.ir.code.Binop asBinop() -> u
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.w6:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.v6:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position callerPosition -> a
@@ -45584,7 +45367,7 @@
     47:47:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126 -> a
     48:51:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126:129 -> a
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):63:63 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.y6:
     java.util.List guards -> b
     java.util.Set uniqueTargets -> d
     java.util.List targets -> c
@@ -45613,18 +45396,18 @@
     1:1:int hashCode():144:144 -> hashCode
     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.x6:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.w6:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> c
     int nextIndex -> b
     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.y6:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.x6:
     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.q9:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.p9:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexType type -> i
     boolean ignoreCompatRules -> j
@@ -45652,7 +45435,7 @@
     66:67:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):250:251 -> a
     68:68:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):262:262 -> a
     69:69:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):267:267 -> a
-    70:70:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    70:70:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     70:70:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):267 -> a
     71:71:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):267:267 -> a
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):126:126 -> b
@@ -45676,7 +45459,7 @@
     boolean isCheckCast() -> p1
     1:1:java.lang.String toString():195:195 -> toString
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> v
-com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.p9:
+com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.o9:
     com.android.tools.r8.ir.code.Value object -> d
     com.android.tools.r8.graph.DexType castType -> c
     1:1:void <init>():275:275 -> <init>
@@ -45687,7 +45470,7 @@
     3:3:void com.android.tools.r8.ir.code.CheckCast.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):40:40 -> b
     3:3:com.android.tools.r8.ir.code.CheckCast build():292 -> b
     4:4:com.android.tools.r8.ir.code.CheckCast build():292:292 -> b
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.vb:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.ub:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.Cmp$Bias bias -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -45764,12 +45547,12 @@
     165:165:java.lang.String toString():110 -> toString
     166:187:java.lang.String toString():110:131 -> toString
     com.android.tools.r8.ir.code.Cmp asCmp() -> w
-com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.tb:
+com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.sb:
     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.ub:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.tb:
     com.android.tools.r8.ir.code.Cmp$Bias GT -> c
     com.android.tools.r8.ir.code.Cmp$Bias[] $VALUES -> e
     com.android.tools.r8.ir.code.Cmp$Bias LT -> d
@@ -45778,7 +45561,7 @@
     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.hd:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.gd:
     com.android.tools.r8.graph.DexType clazz -> j
     int $r8$clinit -> m
     boolean ignoreCompatRules -> k
@@ -45806,7 +45589,7 @@
     14:14:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):190:190 -> a
     15:15:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):195:195 -> a
     16:16:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):200:200 -> a
-    17:17:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    17:17:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     17:17:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):200 -> a
     18:18:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):200:200 -> a
     19:19:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):613:613 -> a
@@ -45828,7 +45611,7 @@
     1:1:com.android.tools.r8.graph.DexType getValue():75:75 -> n2
     1:1:java.lang.String toString():102:102 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> x
-com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.gd:
+com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.fd:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>():212:212 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
@@ -45837,7 +45620,7 @@
     2:2:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> b
     2:2:com.android.tools.r8.ir.code.ConstClass build():223 -> b
     3:3:com.android.tools.r8.ir.code.ConstClass build():223:223 -> b
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.id:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.hd:
     int $r8$clinit -> i
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> Q0
@@ -45847,7 +45630,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isConstInstruction() -> r1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> y
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.kd:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.jd:
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -45880,7 +45663,7 @@
     1:1:com.android.tools.r8.graph.DexMethodHandle getValue():55:55 -> m2
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> z
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.ld:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.kd:
     com.android.tools.r8.graph.DexProto methodType -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -45912,7 +45695,7 @@
     int maxOutValueRegister() -> i2
     int opcode() -> j2
     1:1:java.lang.String toString():87:87 -> toString
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.nd:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.md:
     long value -> j
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
@@ -45982,10 +45765,10 @@
     1:1:boolean isZero():111:111 -> v2
     1:1:boolean negativeIs16Bit():292:292 -> w2
     1:1:boolean negativeIs8Bit():284:284 -> x2
-com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.md:
+com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.ld:
     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.pd:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.od:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexString value -> j
@@ -46003,10 +45786,10 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71 -> a
     6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:72 -> 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):134:134 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> 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 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> 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
@@ -46028,7 +45811,7 @@
     int opcode() -> j2
     1:1:com.android.tools.r8.graph.DexString getValue():61:61 -> m2
     1:1:java.lang.String toString():93:93 -> toString
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.xd:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.wd:
     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
@@ -46038,17 +45821,17 @@
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
     12:12:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):29 -> a
     13:15:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):30:32 -> a
-    16:16:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> a
+    16:16:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> a
     16:16:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):32 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> a
+    17:17:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> a
     17:17:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):32 -> a
     18:18:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):33:33 -> a
     19:20:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:43 -> a
-    21:21:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> a
+    21:21:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> a
     21:21:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:22:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> a
+    22:22:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> a
     22:22:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):43 -> a
     23:23:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):42:42 -> a
     24:24:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> a
@@ -46072,7 +45855,7 @@
     43:43:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     43:43:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     44:44: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.Be:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.Ae:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -46089,11 +45872,11 @@
     1:1:int maxInValueRegister():60:60 -> h2
     1:1:int maxOutValueRegister():65:65 -> i2
     int opcode() -> j2
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.Ce:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.Be:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean isAllowedAfterThrowingInstruction() -> f1
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.De:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.Ce:
     boolean $assertionsDisabled -> j
     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>
@@ -46107,7 +45890,7 @@
     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
     boolean isAllowedAfterThrowingInstruction() -> f1
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.Ee:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.De:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> i
     boolean $assertionsDisabled -> k
@@ -46140,7 +45923,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():44:44 -> m2
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> n2
     1:6:java.lang.String toString():93:98 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.Fe:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.Ee:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -46170,7 +45953,7 @@
     1:1:int maxInValueRegister():56:56 -> h2
     1:1:int maxOutValueRegister():61:61 -> i2
     int opcode() -> j2
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.Ke:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.Fe:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -46183,13 +45966,13 @@
     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.Te:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.Oe:
     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.NewUnboxedEnumInstance) -> a
     java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewInstance) -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.zg:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.ug:
     int $r8$clinit -> m
     com.android.tools.r8.graph.DexReference item -> j
     boolean $assertionsDisabled -> l
@@ -46226,7 +46009,7 @@
     1:1:com.android.tools.r8.graph.DexReference getItem():59:59 -> m2
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():63:63 -> n2
     1:1:java.lang.String toString():109:109 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.qh:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.lh:
     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() -> G
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -46256,7 +46039,7 @@
     int opcode() -> j2
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> r2
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.th:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.oh:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -46308,7 +46091,7 @@
     319:319:java.lang.String toString():308:308 -> toString
     320:320:java.lang.String toString():309:309 -> toString
     311:317:java.lang.String toString():310:316 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.rh:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.mh:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
     com.android.tools.r8.ir.code.BasicBlock current -> b
     boolean $assertionsDisabled -> d
@@ -46317,11 +46100,11 @@
     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.sh:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.nh:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> b
     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.Ch:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.xh:
     boolean $assertionsDisabled -> i
     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>
@@ -46349,7 +46132,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue outTop():57 -> n2
     2:2:com.android.tools.r8.ir.code.StackValue outTop():57:57 -> n2
     1:1:com.android.tools.r8.ir.code.StackValue src():61:61 -> o2
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Bh:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.wh:
     boolean $assertionsDisabled -> i
     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>
@@ -46369,9 +46152,9 @@
     int maxInValueRegister() -> h2
     1:1:int maxOutValueRegister():104:104 -> i2
     int opcode() -> j2
-com.android.tools.r8.ir.code.FieldGet -> com.android.tools.r8.internal.Kj:
+com.android.tools.r8.ir.code.FieldGet -> com.android.tools.r8.internal.Fj:
     com.android.tools.r8.ir.code.Value outValue() -> a
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.Nj:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.Ij:
     com.android.tools.r8.graph.DexField field -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():27:27 -> <clinit>
@@ -46404,7 +46187,7 @@
     1:1:com.android.tools.r8.graph.DexField getField():48:48 -> getField
     1:1:com.android.tools.r8.ir.code.FieldMemberType getType():44:44 -> m2
     boolean isFieldInstruction() -> z1
-com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Oj:
+com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Jj:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -46414,40 +46197,40 @@
     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.FieldPut -> com.android.tools.r8.internal.Wj:
+com.android.tools.r8.ir.code.FieldPut -> com.android.tools.r8.internal.Rj:
     void setValue(com.android.tools.r8.ir.code.Value) -> a
     boolean isStaticPut() -> b
     int getValueIndex() -> e
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.wk:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.rk:
     int register -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.TypeElement,int):17:19 -> <init>
-    boolean isConstant() -> L
+    boolean isConstant() -> K
+    1:3:com.android.tools.r8.ir.code.ValueType outType():24:26 -> a0
+    4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a0
+    4:4:com.android.tools.r8.ir.code.ValueType outType():27 -> a0
+    5:5:com.android.tools.r8.ir.code.ValueType outType():28:28 -> a0
+    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> a0
+    6:6:com.android.tools.r8.ir.code.ValueType outType():30 -> a0
+    7:10:com.android.tools.r8.ir.code.ValueType outType():31:34 -> a0
+    11:11:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> a0
+    11:11:com.android.tools.r8.ir.code.ValueType outType():35 -> a0
+    12:12:com.android.tools.r8.ir.code.ValueType outType():36:36 -> a0
+    13:13:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> a0
+    13:13:com.android.tools.r8.ir.code.ValueType outType():38 -> a0
+    14:21:com.android.tools.r8.ir.code.ValueType outType():39:46 -> a0
+    22:23:com.android.tools.r8.ir.code.ValueType outType():43:44 -> a0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> b
     boolean isDefinedByInstructionSatisfying(java.util.function.Predicate) -> b
-    1:3:com.android.tools.r8.ir.code.ValueType outType():24:26 -> b0
-    4:4:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> b0
-    4:4:com.android.tools.r8.ir.code.ValueType outType():27 -> b0
-    5:5:com.android.tools.r8.ir.code.ValueType outType():28:28 -> b0
-    6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> b0
-    6:6:com.android.tools.r8.ir.code.ValueType outType():30 -> b0
-    7:10:com.android.tools.r8.ir.code.ValueType outType():31:34 -> b0
-    11:11:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> b0
-    11:11:com.android.tools.r8.ir.code.ValueType outType():35 -> b0
-    12:12:com.android.tools.r8.ir.code.ValueType outType():36:36 -> b0
-    13:13:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> b0
-    13:13:com.android.tools.r8.ir.code.ValueType outType():38 -> b0
-    14:21:com.android.tools.r8.ir.code.ValueType outType():39:46 -> b0
-    22:23:com.android.tools.r8.ir.code.ValueType outType():43:44 -> b0
-    1:1:int getRegister():50:50 -> h0
+    1:1:int getRegister():50:50 -> g0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77,"2":78,"3":79}}
     77:77:java.lang.String toString():75:75 -> toString
     78:78:java.lang.String toString():75:75 -> toString
     79:79:java.lang.String toString():75:75 -> toString
     76:76:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Zl:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Ul:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -46466,11 +46249,11 @@
     1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():40:43 -> n2
     1:4:java.lang.String toString():75:78 -> toString
     5:5:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":83,"2":84,"3":85}}
-    83:83:java.lang.String toString():78:78 -> toString
-    84:84:java.lang.String toString():78:78 -> toString
-    85:85:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.rn:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6,"2":7,"3":8}}
+    6:6:java.lang.String toString():78:78 -> toString
+    7:7:java.lang.String toString():78:78 -> toString
+    8:8:java.lang.String toString():78:78 -> toString
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.nn:
     boolean $assertionsDisabled -> l
     boolean numbered -> f
     int nextInstructionNumber -> g
@@ -46898,7 +46681,7 @@
     27:28:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> z
     27:28:void prepareBlocksForCatchHandlers():360 -> z
     29:35:void prepareBlocksForCatchHandlers():361:367 -> z
-com.android.tools.r8.ir.code.IRCode$1 -> com.android.tools.r8.internal.on:
+com.android.tools.r8.ir.code.IRCode$1 -> com.android.tools.r8.internal.kn:
     com.android.tools.r8.ir.code.Argument next -> c
     com.android.tools.r8.ir.code.InstructionIterator instructionIterator -> b
     1:4:void <init>(com.android.tools.r8.ir.code.IRCode):1091:1094 -> <init>
@@ -46907,10 +46690,10 @@
     1:5:java.lang.Object next():1091 -> next
     6:6:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.code.IRCode$1.next():1104:1104 -> next
     6:6:java.lang.Object next():1091 -> next
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.pn:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.ln:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):103:104 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.qn:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.mn:
     java.util.Deque liveStackValues -> c
     java.util.Set liveLocalValues -> b
     java.util.LinkedHashSet liveValues -> a
@@ -46919,7 +46702,7 @@
     1:5:void <init>(java.util.LinkedHashSet,java.util.Set,java.util.Deque):76:80 -> <init>
     1:2:boolean equals(java.lang.Object):90:91 -> equals
     1:1:int hashCode():85:85 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.sn:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.on:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -46934,7 +46717,7 @@
     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.tn:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.pn:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -46980,7 +46763,7 @@
     1:1:void set(java.lang.Object):24:24 -> set
     2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):222:222 -> set
     2:2:void set(java.lang.Object):24 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.vn:
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.rn:
     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
@@ -46998,7 +46781,7 @@
     76:76:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():110:110 -> a
     76:76:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148 -> a
     77:80:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148:151 -> a
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.xn:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.tn:
     long second -> b
     long first -> a
     boolean $assertionsDisabled -> c
@@ -47115,7 +46898,7 @@
     1:1:boolean mayHaveInvokeSuper():206:206 -> x
     1:1:boolean mayHaveInvokeVirtual():210:210 -> y
     1:1:boolean mayHaveMonitorInstruction():214:214 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.On:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.Kn:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.If$Type type -> j
@@ -47183,10 +46966,10 @@
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():236:238 -> t2
     1:8:java.lang.String toString():170:177 -> toString
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNullObject():242:244 -> u2
-com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.Nn:
+com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.Jn:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():28:28 -> <clinit>
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.On$a:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.Kn$a:
     com.android.tools.r8.ir.code.If$Type GE -> c
     com.android.tools.r8.ir.code.If$Type GT -> d
     com.android.tools.r8.ir.code.If$Type EQ -> b
@@ -47209,10 +46992,10 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():50:58 -> b
     28:28:com.android.tools.r8.ir.code.If$Type inverted():48:48 -> b
     1:1:com.android.tools.r8.ir.code.If$Type[] values():23:23 -> c
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.Oo:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.Ko:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> d
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.So:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.Oo:
     boolean $assertionsDisabled -> j
     int increment -> i
     1:1:void <clinit>():20:20 -> <clinit>
@@ -47228,7 +47011,7 @@
     int maxOutValueRegister() -> i2
     int opcode() -> j2
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.kp:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.dp:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -47256,16 +47039,16 @@
     1:1:com.android.tools.r8.ir.code.InitClass$Builder builder():39:39 -> m2
     1:1:com.android.tools.r8.graph.DexType getClassValue():43:43 -> n2
     1:1:java.lang.String toString():171:171 -> toString
-com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.jp:
+com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.cp:
     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>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.InitClass$Builder setType(com.android.tools.r8.graph.DexType):181:181 -> a
     1:1:com.android.tools.r8.ir.code.InitClass build():187:187 -> b
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Tp:
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Mp:
     com.android.tools.r8.ir.code.Value object() -> i
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Wp:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Pp:
     boolean $assertionsDisabled -> k
     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>
@@ -47320,7 +47103,7 @@
     boolean throwsOnNullInput() -> l2
     1:1:java.lang.String toString():182:182 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():68:68 -> value
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.fq:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.Yp:
     com.android.tools.r8.graph.DexType type -> i
     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() -> Q
@@ -47345,7 +47128,7 @@
     1:1:com.android.tools.r8.graph.DexType type():40:40 -> m2
     1:2:java.lang.String toString():127:128 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():48:48 -> value
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.gq:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.Zp:
     boolean $assertionsDisabled -> k
     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>
@@ -47401,7 +47184,7 @@
     boolean throwsOnNullInput() -> l2
     1:1:java.lang.String toString():233:233 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():79:79 -> value
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.qq:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.jq:
     com.android.tools.r8.ir.code.Position position -> g
     java.util.List inValues -> c
     java.util.Set debugValues -> f
@@ -47765,7 +47548,7 @@
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> z
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> z0
     boolean isFieldInstruction() -> z1
-com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.jq:
+com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.cq:
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.code.Value outValue -> a
     1:1:void <init>():1632:1632 -> <init>
@@ -47779,7 +47562,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1667:1667 -> b
     2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1662:1663 -> b
     2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1667 -> b
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.pq:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.iq:
     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
@@ -47791,26 +47574,26 @@
     boolean canAssumeInvokedMethodDoesNotHaveSideEffects() -> b
     boolean canAssumeReceiverIsNotNull() -> c
     1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1609:1609 -> d
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.kq:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.dq:
     1:1:void <init>():1557:1557 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.lq:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.eq:
     1:1:void <init>():1566:1566 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.mq:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.fq:
     1:1:void <init>():1575:1575 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.nq:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.gq:
     1:1:void <init>():1584:1584 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.oq:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.hq:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption val$other -> f
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption this$0 -> g
     1:1610:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):0:1609 -> <init>
     1:2:boolean canAssumeClassIsAlreadyInitialized():1613:1614 -> a
     1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1619:1620 -> b
     1:2:boolean canAssumeReceiverIsNotNull():1625:1626 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.sq:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.lq:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> d
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> f
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.tq:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.mq:
     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.DexProgramClass) -> 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
@@ -47845,12 +47628,12 @@
     void removeOrReplaceByDebugLocalRead() -> e
     void unsetInsertionPosition() -> h
     1:1:void removeInstructionIgnoreOutValue():70:70 -> i
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.uq:
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.nq:
     boolean isPhi() -> f
     com.android.tools.r8.ir.code.Instruction asInstruction() -> g
     com.android.tools.r8.ir.code.Phi asPhi() -> h
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> j
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.Dt:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.wt:
     boolean $assertionsDisabled -> n
     int[] keys -> m
     1:1:void <clinit>():28:28 -> <clinit>
@@ -48009,7 +47792,7 @@
     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.su:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.lu:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):224:224 -> <init>
@@ -48161,7 +47944,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> s2
     3:3:int requiredArgumentRegisters():295 -> s2
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.ru:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.ku:
     com.android.tools.r8.ir.code.Invoke$Type STATIC -> f
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Invoke$Type SUPER -> g
@@ -48183,7 +47966,7 @@
     49:50:int getDexOpcode():171:172 -> a
     1:2:int getDexOpcodeRange():176:177 -> b
     1:1:boolean isVirtual():197:197 -> c
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.tu:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.mu:
     com.android.tools.r8.graph.DexCallSite callSite -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():26:26 -> <clinit>
@@ -48232,7 +48015,7 @@
     1:1:java.lang.String getTypeString():116:116 -> q2
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():106:106 -> t2
     1:1:java.lang.String toString():121:121 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.wu:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.pu:
     boolean isInterface -> m
     boolean $assertionsDisabled -> n
     int $r8$clinit -> o
@@ -48262,7 +48045,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():70:70 -> p2
     1:1:java.lang.String getTypeString():75:75 -> q2
     1:1:boolean getInterfaceBit():60:60 -> t2
-com.android.tools.r8.ir.code.InvokeDirect$Builder -> com.android.tools.r8.internal.vu:
+com.android.tools.r8.ir.code.InvokeDirect$Builder -> com.android.tools.r8.internal.ou:
     1:1:void <init>():219:219 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:3:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):287:289 -> a
@@ -48275,7 +48058,7 @@
     2:2:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> b
     2:2:com.android.tools.r8.ir.code.InvokeDirect build():223 -> b
     3:3:com.android.tools.r8.ir.code.InvokeDirect build():223:223 -> b
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.zu:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.su:
     boolean $assertionsDisabled -> m
     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>
@@ -48298,7 +48081,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> p2
     1:1:java.lang.String getTypeString():57:57 -> q2
     boolean getInterfaceBit() -> t2
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.Bu:
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.uu:
     com.android.tools.r8.graph.DexMethod method -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():42:42 -> <clinit>
@@ -48364,13 +48147,13 @@
     boolean getInterfaceBit() -> t2
     1:1:java.lang.String toString():100:100 -> toString
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():90:90 -> u2
-com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.Au:
+com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.tu:
     java.util.List arguments -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> c
     1:1:void <clinit>():280:280 -> <clinit>
     1:5:void <init>():280:284 -> <init>
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.Cu:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.vu:
     boolean $assertionsDisabled -> l
     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>
@@ -48416,7 +48199,7 @@
     1:1:java.lang.Iterable getNonReceiverArguments():37 -> v2
     2:2:java.lang.Iterable getNonReceiverArguments():37:37 -> v2
     1:2:com.android.tools.r8.ir.code.Value getReceiver():63:64 -> w2
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.Du:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.wu:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():25:25 -> <clinit>
@@ -48453,7 +48236,7 @@
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():271:271 -> u2
     1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> u2
     2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> u2
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.Eu:
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.xu:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():28:28 -> <clinit>
@@ -48492,7 +48275,7 @@
     1:1:java.lang.String getTypeString():63:63 -> q2
     1:1:com.android.tools.r8.graph.DexType getArrayType():53:53 -> t2
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.Fu:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.yu:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexProto proto -> l
     1:1:void <clinit>():29:29 -> <clinit>
@@ -48534,7 +48317,7 @@
     1:1:java.lang.String getTypeString():65:65 -> q2
     boolean getInterfaceBit() -> t2
     1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> v2
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Ku:
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Du:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     boolean isInterface -> l
@@ -48582,7 +48365,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():67:67 -> p2
     1:1:java.lang.String getTypeString():72:72 -> q2
     1:1:boolean getInterfaceBit():52:52 -> t2
-com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.Ju:
+com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.Cu:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():237:237 -> <clinit>
     1:1:void <init>():237:237 -> <init>
@@ -48604,7 +48387,7 @@
     8:9:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:5:com.android.tools.r8.ir.code.InvokeStatic build():241:245 -> b
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Lu:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Eu:
     boolean isInterface -> m
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():26:26 -> <clinit>
@@ -48628,7 +48411,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> p2
     1:1:java.lang.String getTypeString():57:57 -> q2
     1:1:boolean getInterfaceBit():37:37 -> t2
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Ou:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Hu:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     1:1:void <clinit>():30:30 -> <clinit>
@@ -48657,7 +48440,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> p2
     1:1:java.lang.String getTypeString():62:62 -> q2
     boolean getInterfaceBit() -> t2
-com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.Nu:
+com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.Gu:
     1:1:void <init>():175:175 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:3:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):287:289 -> a
@@ -48667,7 +48450,7 @@
     4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:com.android.tools.r8.ir.code.InvokeVirtual build():179:179 -> b
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.Vv:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.Ov:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -48682,13 +48465,13 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> f0
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> m2
-com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.NA:
     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 -> b
     1:1:com.android.tools.r8.ir.code.DominatorTree get():19:19 -> d
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$get$0():19:19 -> e
-com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.SB:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.LB:
     java.util.Set seenBlocks -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.IRCode code -> b
@@ -48741,7 +48524,7 @@
     1:1:void set(java.lang.Object):23:23 -> set
     2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):288:288 -> set
     2:2:void set(java.lang.Object):23 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.nC:
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.gC:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean hasInvariantOutType() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -48761,7 +48544,7 @@
     1:1:int maxOutValueRegister():62:62 -> i2
     int opcode() -> j2
     1:1:com.android.tools.r8.ir.code.Value src():37:37 -> m2
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.AC:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.tC:
     boolean $assertionsDisabled -> j
     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>
@@ -48806,10 +48589,10 @@
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> d
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> h0
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> r2
-com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.zC:
+com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.sC:
     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.ZD:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.SD:
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> c
     com.android.tools.r8.ir.code.MemberType OBJECT -> b
     com.android.tools.r8.ir.code.MemberType SHORT -> e
@@ -48841,17 +48624,17 @@
     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.wF:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.pF:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Monitor$Type type -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type,com.android.tools.r8.ir.code.Value):30:31 -> <init>
     1:7:java.lang.String getInstructionName():118:124 -> N0
     8:8:java.lang.String getInstructionName():0:0 -> N0
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":137,"2":138,"3":139}}
-    137:137:java.lang.String getInstructionName():124:124 -> N0
-    138:138:java.lang.String getInstructionName():124:124 -> N0
-    139:139:java.lang.String getInstructionName():124:124 -> N0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":134,"2":135,"3":136}}
+    134:134:java.lang.String getInstructionName():124:124 -> N0
+    135:135:java.lang.String getInstructionName():124:124 -> N0
+    136:136:java.lang.String getInstructionName():124:124 -> N0
     132:132:java.lang.String getInstructionName():124:124 -> N0
     133:133:java.lang.String getInstructionName():120:120 -> N0
     1:1:com.android.tools.r8.ir.code.Value getNonNullInput():155:155 -> O0
@@ -48877,10 +48660,10 @@
     int opcode() -> j2
     boolean throwsOnNullInput() -> l2
     1:1:boolean isEnter():49:49 -> m2
-com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.uF:
+com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.nF:
     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.vF:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.oF:
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> d
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> b
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> c
@@ -48888,7 +48671,7 @@
     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.xF:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.qF:
     boolean $assertionsDisabled -> i
     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>
@@ -48917,7 +48700,7 @@
     1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> m2
     1:1:com.android.tools.r8.ir.code.Value src():42:42 -> n2
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.zF:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.sF:
     com.android.tools.r8.graph.DexType exceptionType -> i
     boolean $assertionsDisabled -> k
     com.android.tools.r8.utils.InternalOptions options -> j
@@ -48930,7 +48713,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:48 -> a
     4:6: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
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     7:7:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88 -> 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):91:91 -> 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):89:89 -> a
@@ -48949,7 +48732,7 @@
     int opcode() -> j2
     com.android.tools.r8.ir.code.MoveException asMoveException() -> k0
     1:1:com.android.tools.r8.graph.DexType getExceptionType():126:126 -> m2
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.BF:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.uF:
     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>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -48974,7 +48757,7 @@
     com.android.tools.r8.ir.code.Mul asMul() -> l0
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> r2
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.sG:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.iG:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -49004,10 +48787,10 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
     int opcode() -> j2
     com.android.tools.r8.ir.code.Neg asNeg() -> m0
-com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.rG:
+com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.hG:
     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.CG:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.sG:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -49046,7 +48829,7 @@
     1:1:com.android.tools.r8.ir.code.Value size():55:55 -> m2
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> n0
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.DG:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.tG:
     long size -> j
     short[] data -> k
     int element_width -> i
@@ -49087,7 +48870,7 @@
     int opcode() -> j2
     1:1:com.android.tools.r8.ir.code.Value src():50:50 -> m2
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> o0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.FG:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.vG:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexType clazz -> i
     boolean allowSpilling -> j
@@ -49125,13 +48908,13 @@
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> p0
     1:1:void markNoSpilling():207:207 -> p2
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.NewInstance$Builder -> com.android.tools.r8.internal.EG:
+com.android.tools.r8.ir.code.NewInstance$Builder -> com.android.tools.r8.internal.uG:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>():236:236 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.NewInstance$Builder setType(com.android.tools.r8.graph.DexType):241:241 -> a
     1:1:com.android.tools.r8.ir.code.NewInstance build():247:247 -> b
-com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.GG:
+com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.wG:
     com.android.tools.r8.graph.DexType clazz -> i
     int ordinal -> j
     boolean $assertionsDisabled -> k
@@ -49159,9 +48942,9 @@
     1:1:int getOrdinal():55:55 -> m2
     com.android.tools.r8.ir.code.NewUnboxedEnumInstance asNewUnboxedEnumInstance() -> q0
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.HG:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.xG:
     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.EH:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.uH:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():19:19 -> <clinit>
@@ -49190,10 +48973,10 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     int opcode() -> j2
     com.android.tools.r8.ir.code.Not asNot() -> r0
-com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.DH:
+com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.tH:
     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.QH:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.GH:
     com.android.tools.r8.ir.code.NumericType to -> j
     com.android.tools.r8.ir.code.NumericType from -> i
     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>
@@ -49253,15 +49036,15 @@
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
     int opcode() -> j2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> s0
-com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.PH:
+com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.FH:
     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.UH:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.KH:
     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.ZH:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.PH:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> h
     com.android.tools.r8.ir.code.NumericType FLOAT -> g
     com.android.tools.r8.ir.code.NumericType LONG -> f
@@ -49288,10 +49071,10 @@
     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.YH:
+com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.OH:
     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.MK:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.CK:
     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>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -49311,7 +49094,7 @@
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> r2
     com.android.tools.r8.ir.code.Or asOr() -> t0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.HL:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.xL:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -49321,10 +49104,10 @@
     1:1:void <clinit>():36:36 -> <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):60:60 -> <init>
     2:21: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):44:63 -> <init>
-    boolean isConstant() -> L
-    1:2:boolean isValueOnStack():371:372 -> S
-    1:1:void markNonDebugLocalRead():164:164 -> V
-    1:1:boolean needsRegister():394:394 -> W
+    boolean isConstant() -> K
+    1:2:boolean isValueOnStack():371:372 -> R
+    1:1:void markNonDebugLocalRead():164:164 -> U
+    1:1:boolean needsRegister():394:394 -> V
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):45:46 -> a
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):425 -> a
     3:24:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):426:447 -> a
@@ -49411,48 +49194,48 @@
     164:173:boolean removeTrivialPhi(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):303:312 -> a
     174:181:void print(com.android.tools.r8.utils.CfgPrinter):341:348 -> a
     182:182:void addDefinitionsUser(java.util.Map):353:353 -> a
-    183:183:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:402 -> a
-    184:184:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
-    184:184:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402 -> a
-    185:193:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:410 -> a
+    183:186:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):383:386 -> a
+    187:187:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:402 -> a
+    188:188:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    188:188:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402 -> a
+    189:197: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:1:void removeDefinitionsUser(java.util.Map):357:357 -> b
-    2:5:void lambda$verifyIsStackPhi$0(java.util.Set,com.android.tools.r8.ir.code.Value):383:386 -> b
     1:2:boolean verifyIsStackPhi(java.util.Set):380:381 -> c
     3:5:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):415:417 -> c
     1:2:void removeOperand(int):188:189 -> d
     boolean isPhi() -> f
+    1:1:void clearDefinitionsUsers():361:361 -> g0
     com.android.tools.r8.ir.code.Phi asPhi() -> h
-    1:2:void appendOperand(com.android.tools.r8.ir.code.Value):175:176 -> h
-    1:1:void clearDefinitionsUsers():361:361 -> h0
-    1:1:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):398:398 -> i
-    1:1:java.util.List getOperands():184:184 -> i0
+    1:1:java.util.List getOperands():184:184 -> h0
+    1:2:void appendOperand(com.android.tools.r8.ir.code.Value):175:176 -> i
+    1:1:boolean isTrivialPhi():225:225 -> i0
     1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():83:83 -> j
-    1:1:boolean isTrivialPhi():225:225 -> j0
-    1:1:java.lang.String printPhi():0:0 -> k0
+    2:2:boolean usesValueOneTime(com.android.tools.r8.ir.code.Value):398:398 -> j
+    1:1:java.lang.String printPhi():0:0 -> j0
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":339,"2":340,"3":341}}
-    339:339:java.lang.String printPhi():328:328 -> k0
-    340:340:java.lang.String printPhi():328:328 -> k0
-    341:341:java.lang.String printPhi():329:329 -> k0
-    331:338:java.lang.String printPhi():330:337 -> k0
-    1:4:void removeDeadPhi():318:321 -> l0
-    5:5:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():83:83 -> l0
-    5:5:void removeDeadPhi():324 -> l0
-    6:6:void removeDeadPhi():324:324 -> l0
-    1:1:boolean removeTrivialPhi():240:240 -> m0
-    1:1:void setIsStackPhi(boolean):376:376 -> n0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.HL$a:
+    339:339:java.lang.String printPhi():328:328 -> j0
+    340:340:java.lang.String printPhi():328:328 -> j0
+    341:341:java.lang.String printPhi():329:329 -> j0
+    331:338:java.lang.String printPhi():330:337 -> j0
+    1:4:void removeDeadPhi():318:321 -> k0
+    5:5:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.Phi.getBlock():83:83 -> k0
+    5:5:void removeDeadPhi():324 -> k0
+    6:6:void removeDeadPhi():324:324 -> k0
+    1:1:boolean removeTrivialPhi():240:240 -> l0
+    1:1:void setIsStackPhi(boolean):376:376 -> m0
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.xL$a:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> b
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> c
     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.IL:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.yL:
     boolean $assertionsDisabled -> x
     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 -> c
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.SL:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.IL:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value):20:21 -> <init>
@@ -49475,7 +49258,7 @@
     1:1:int maxInValueRegister():61:61 -> h2
     1:1:int maxOutValueRegister():66:66 -> i2
     int opcode() -> j2
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.XL:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.NL:
     boolean removeInnerFramesIfThrowingNpe -> e
     boolean $assertionsDisabled -> f
     int line -> b
@@ -49526,7 +49309,7 @@
     1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):205:223 -> toString
     1:19:java.lang.String toString():228 -> toString
     1:1:com.android.tools.r8.ir.code.Position syntheticNone():117:117 -> u
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.UL:
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.KL:
     boolean isOutline -> i
     com.android.tools.r8.graph.DexMethod outlineCallee -> h
     com.android.tools.r8.utils.Int2StructuralItemArrayMap outlinePositions -> g
@@ -49546,7 +49329,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():552:552 -> n
     1:1:boolean isOutline():537:537 -> o
     1:1:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder builder():556:556 -> v
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.TL:
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.JL:
     boolean isOutline -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder outlinePositionsBuilder -> g
@@ -49562,7 +49345,7 @@
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:8:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():595:602 -> d
     1:1:boolean hasOutlinePositions():590:590 -> e
-com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.WL:
+com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.ML:
     1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.ir.code.Position$1):429:429 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):436:436 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
@@ -49576,13 +49359,13 @@
     1:1:void lambda$getStructuralMapping$0(com.android.tools.r8.utils.structural.StructuralSpecification):460:460 -> c
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():460:460 -> n
     1:1:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder builder():464:464 -> v
-com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.VL:
+com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.LL:
     1:1:void <init>(com.android.tools.r8.ir.code.Position$1):467:467 -> <init>
     2:2:void <init>():470:470 -> <init>
     1:1:com.android.tools.r8.ir.code.Position build():467:467 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:1:com.android.tools.r8.ir.code.Position$OutlinePosition build():479:479 -> d
-com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.XL$a:
+com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.NL$a:
     boolean noCheckOfPosition -> e
     boolean noCheckOfMethod -> f
     com.android.tools.r8.graph.DexMethod method -> b
@@ -49597,7 +49380,7 @@
     7:8:com.android.tools.r8.ir.code.Position$PositionBuilder setRemoveInnerFramesIfThrowingNpe(boolean):266:267 -> a
     1:2:com.android.tools.r8.ir.code.Position$PositionBuilder disableMethodCheck():276:277 -> b
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
-com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.XL$b:
+com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.NL$b:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexString file -> g
     com.android.tools.r8.ir.code.Position$SourcePosition NO_POSITION -> h
@@ -49619,7 +49402,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():334:334 -> n
     1:1:com.android.tools.r8.ir.code.Position$SourcePosition access$000():283:283 -> v
     1:1:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder builder():338:338 -> w
-com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.XL$b$a:
+com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.NL$b$a:
     com.android.tools.r8.graph.DexString file -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():341:341 -> <clinit>
@@ -49628,7 +49411,7 @@
     2:2:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder setFile(com.android.tools.r8.graph.DexString):352:352 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:3:com.android.tools.r8.ir.code.Position$SourcePosition build():358:360 -> d
-com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.XL$c:
+com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.NL$c:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     1:1:void <clinit>():371:371 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.ir.code.Position$1):366:366 -> <init>
@@ -49645,7 +49428,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():403:403 -> n
     1:1:com.android.tools.r8.ir.code.Position access$100():366:366 -> v
     1:1:com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder builder():407:407 -> w
-com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.XL$c$a:
+com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.NL$c$a:
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():410:410 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Position$1):410:410 -> <init>
@@ -49653,9 +49436,9 @@
     1:1:com.android.tools.r8.ir.code.Position build():410:410 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> c
     1:3:com.android.tools.r8.ir.code.Position$SyntheticPosition build():422:424 -> d
-com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.zM:
+com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.pM:
     1:3:java.lang.Object previousUntil(java.util.function.Predicate):18:20 -> b
-com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.fQ:
+com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.VP:
     com.android.tools.r8.graph.DexField[] fields -> i
     1:2:void <init>(com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.code.Value,java.util.List):28:29 -> <init>
     boolean hasInvariantOutType() -> V0
@@ -49685,7 +49468,7 @@
     int opcode() -> j2
     1:1:com.android.tools.r8.graph.DexField[] getFields():33:33 -> m2
     com.android.tools.r8.ir.code.RecordFieldValues asRecordFieldValues() -> u0
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.oS:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.eS:
     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>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -49715,7 +49498,7 @@
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> r2
     com.android.tools.r8.ir.code.Rem asRem() -> v0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.zT:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.pT:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     1:1:void <clinit>():21:21 -> <clinit>
@@ -49769,20 +49552,20 @@
     1:1:boolean isReturnVoid():46:46 -> n2
     1:2:com.android.tools.r8.ir.code.Value returnValue():59:60 -> o2
     com.android.tools.r8.ir.code.Return asReturn() -> w0
-com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.yT:
+com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.oT:
     1:1:void <init>():139:139 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.Return build():143:143 -> b
-com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.RT:
+com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.HT:
     int $r8$clinit -> m
     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.QT:
+com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.GT:
     1:1:void <init>():48:48 -> <init>
     1:1:com.android.tools.r8.ir.code.CheckCast build():52:52 -> b
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.rU:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.hU:
     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>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -49803,7 +49586,7 @@
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> r2
     com.android.tools.r8.ir.code.Shl asShl() -> x0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.tU:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.jU:
     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>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -49824,38 +49607,38 @@
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> r2
     com.android.tools.r8.ir.code.Shr asShr() -> y0
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.RU:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.HU:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.VV:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.LV:
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
     boolean $assertionsDisabled -> t
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:void <init>(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,com.android.tools.r8.ir.analysis.type.TypeElement,int):17:20 -> <init>
-    boolean needsRegister() -> W
+    boolean needsRegister() -> V
     1:3:com.android.tools.r8.ir.code.StackValue create(com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo,int,com.android.tools.r8.graph.AppView):24:26 -> a
     4:4:com.android.tools.r8.ir.code.StackValue duplicate(int):39:39 -> a
     5:5:void setNeedsRegister(boolean):54:54 -> a
-    1:1:int getHeight():31:31 -> h0
-    1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> i0
+    1:1:int getHeight():31:31 -> g0
+    1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> h0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":61,"2":62,"3":63}}
     61:61:java.lang.String toString():59:59 -> toString
     62:62:java.lang.String toString():59:59 -> toString
     63:63:java.lang.String toString():59:59 -> toString
     60:60:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.WV:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.MV:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.code.StackValue[]):19:21 -> <init>
-    boolean isValueOnStack() -> S
-    boolean needsRegister() -> W
+    boolean isValueOnStack() -> R
+    boolean needsRegister() -> V
     1:1:void setNeedsRegister(boolean):35:35 -> a
-    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> h0
+    1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> g0
     1:10:java.lang.String toString():40:49 -> toString
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> w
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.mW:
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> v
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.cW:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():35:35 -> <clinit>
@@ -49915,13 +49698,13 @@
     1:1:com.android.tools.r8.ir.code.Value value():72:72 -> value
     boolean isFieldGet() -> y1
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> z0
-com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.lW:
+com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.bW:
     com.android.tools.r8.graph.DexField field -> c
     1:1:void <init>():260:260 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.StaticGet$Builder setField(com.android.tools.r8.graph.DexField):269:269 -> a
     1:1:com.android.tools.r8.ir.code.StaticGet build():275:275 -> b
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.oW:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.eW:
     boolean $assertionsDisabled -> k
     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>
@@ -49973,7 +49756,7 @@
     int opcode() -> j2
     1:1:java.lang.String toString():188:188 -> toString
     1:2:com.android.tools.r8.ir.code.Value value():56:57 -> value
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.pW:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.fW:
     boolean $assertionsDisabled -> i
     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>
@@ -49997,7 +49780,7 @@
     int maxOutValueRegister() -> i2
     int opcode() -> j2
     1:1:com.android.tools.r8.ir.code.Value src():39:39 -> m2
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.NW:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.DW:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexString[] keys -> m
     1:1:void <clinit>():17:17 -> <clinit>
@@ -50022,7 +49805,7 @@
     5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.code.StringSwitch.getKey(int):80:80 -> toString
     5:5:java.lang.String toString():89 -> toString
     6:11:java.lang.String toString():89:94 -> toString
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.pX:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.fX:
     boolean $assertionsDisabled -> k
     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>
@@ -50065,7 +49848,7 @@
     7:9:int maxInOutValueRegisterSize():136 -> p2
     10:12:int maxInOutValueRegisterSize():136:138 -> p2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> r2
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.yX:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.oX:
     boolean $assertionsDisabled -> i
     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>
@@ -50085,7 +49868,7 @@
     int maxInValueRegister() -> h2
     1:1:int maxOutValueRegister():85:85 -> i2
     int opcode() -> j2
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.zX:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.pX:
     int fallthroughBlockIndex -> k
     boolean $assertionsDisabled -> l
     int[] targetBlockIndices -> j
@@ -50111,7 +49894,7 @@
     4:4:boolean valid():29 -> q2
     5:5:boolean valid():29:29 -> q2
     1:1:com.android.tools.r8.ir.code.Value value():24:24 -> value
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.bY:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.RX:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -50133,17 +49916,17 @@
     1:1:int maxOutValueRegister():49:49 -> i2
     int opcode() -> j2
     1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> n2
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.XZ:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.NZ:
     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.ir.analysis.type.TypeElement getOutType() -> c
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> k
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.WZ:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.MZ:
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> c
     com.android.tools.r8.graph.DebugLocalInfo val$local -> b
     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 -> c
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> k
-com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.y00:
+com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.o00:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):29:29 -> <init>
     boolean hasInvariantOutType() -> V0
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -50157,7 +49940,7 @@
     int maxInValueRegister() -> h2
     int maxOutValueRegister() -> i2
     int opcode() -> j2
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.N00:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.D00:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean hasInvariantOutType() -> V0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
@@ -50169,7 +49952,7 @@
     int maxInValueRegister() -> h2
     int maxOutValueRegister() -> i2
     1:1:com.android.tools.r8.ir.code.Value source():25:25 -> m2
-com.android.tools.r8.ir.code.UnusedArgument -> com.android.tools.r8.internal.V00:
+com.android.tools.r8.ir.code.UnusedArgument -> com.android.tools.r8.internal.L00:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):26:26 -> <init>
     boolean hasInvariantOutType() -> V0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -50185,7 +49968,7 @@
     1:1:int maxInValueRegister():97:97 -> h2
     1:1:int maxOutValueRegister():102:102 -> i2
     int opcode() -> j2
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.b10:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.R00:
     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() -> G0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -50206,7 +49989,7 @@
     int opcode() -> j2
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> r2
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.j10:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.Z00:
     com.android.tools.r8.ir.regalloc.LiveIntervals liveIntervals -> j
     com.android.tools.r8.ir.analysis.type.TypeElement type -> o
     int needsRegister -> k
@@ -50226,45 +50009,46 @@
     1:114:void <clinit>():53:166 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):183:183 -> <init>
     2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):169:187 -> <init>
-    1:1:boolean hasLocalInfo():271:271 -> A
-    1:1:boolean hasNonDebugUsers():414:414 -> B
-    1:1:boolean hasPhiUsers():418:418 -> C
-    1:1:boolean hasUsers():422:422 -> D
-    1:1:boolean hasUsersInfo():554:554 -> F
-    1:1:boolean hasValueRange():948:948 -> G
-    1:1:boolean isArgument():874:874 -> H
-    1:1:boolean isConstClass():828:828 -> I
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> I
-    2:2:boolean isConstClass():828 -> I
-    1:1:boolean isConstNumber():799:799 -> J
-    1:1:boolean isConstString():812:812 -> K
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> K
-    2:2:boolean isConstString():812 -> K
-    1:1:boolean isConstant():832:832 -> L
-    1:1:boolean isDexItemBasedConstString():816:816 -> M
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> M
-    2:2:boolean isDexItemBasedConstString():816 -> M
-    boolean isFixedRegisterValue() -> N
-    1:1:boolean isLinked():314:314 -> O
-    1:3:boolean isNeverNull():868:870 -> P
-    1:1:boolean isThis():940:940 -> Q
-    1:1:boolean isUsed():463:463 -> R
-    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():455:455 -> R
-    2:2:boolean isUsed():463 -> R
-    boolean isValueOnStack() -> S
-    1:3:boolean isZero():1042:1044 -> T
-    1:3:void markAsThis():929:931 -> U
-    1:1:void markNonDebugLocalRead():149:149 -> V
-    1:2:boolean needsRegister():706:707 -> W
-    3:10:boolean com.android.tools.r8.ir.code.Value.internalComputeNeedsRegister():722:729 -> W
-    3:10:boolean needsRegister():707 -> W
-    11:12:boolean needsRegister():707:708 -> W
-    1:1:int com.android.tools.r8.ir.code.Value.numberOfAllNonDebugUsers():451:451 -> X
-    1:1:int numberOfAllUsers():459 -> X
-    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():455:455 -> X
-    2:2:int numberOfAllUsers():459 -> X
-    1:5:int numberOfPhiUsers():443:447 -> Y
-    1:5:int numberOfUsers():435:439 -> Z
+    1:1:boolean hasNonDebugUsers():414:414 -> A
+    1:1:boolean hasPhiUsers():418:418 -> B
+    1:1:boolean hasUsers():422:422 -> C
+    1:1:boolean hasUsersInfo():554:554 -> D
+    1:1:boolean hasValueRange():948:948 -> F
+    1:1:boolean isArgument():874:874 -> G
+    1:1:boolean isConstClass():828:828 -> H
+    2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> H
+    2:2:boolean isConstClass():828 -> H
+    1:1:boolean isConstNumber():799:799 -> I
+    1:1:boolean isConstString():812:812 -> J
+    2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> J
+    2:2:boolean isConstString():812 -> J
+    1:1:boolean isConstant():832:832 -> K
+    1:1:boolean isDexItemBasedConstString():816:816 -> L
+    2:2:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> L
+    2:2:boolean isDexItemBasedConstString():816 -> L
+    boolean isFixedRegisterValue() -> M
+    1:1:boolean isLinked():314:314 -> N
+    1:3:boolean isNeverNull():868:870 -> O
+    1:1:boolean isThis():940:940 -> P
+    1:1:boolean isUsed():463:463 -> Q
+    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():455:455 -> Q
+    2:2:boolean isUsed():463 -> Q
+    boolean isValueOnStack() -> R
+    1:3:boolean isZero():1042:1044 -> S
+    1:3:void markAsThis():929:931 -> T
+    1:1:void markNonDebugLocalRead():149:149 -> U
+    1:2:boolean needsRegister():706:707 -> V
+    3:10:boolean com.android.tools.r8.ir.code.Value.internalComputeNeedsRegister():722:729 -> V
+    3:10:boolean needsRegister():707 -> V
+    11:12:boolean needsRegister():707:708 -> V
+    1:1:int com.android.tools.r8.ir.code.Value.numberOfAllNonDebugUsers():451:451 -> W
+    1:1:int numberOfAllUsers():459 -> W
+    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():455:455 -> W
+    2:2:int numberOfAllUsers():459 -> W
+    1:5:int numberOfPhiUsers():443:447 -> X
+    1:5:int numberOfUsers():435:439 -> Y
+    1:15:boolean onlyDependsOnArgument():878:892 -> Z
+    16:16:boolean onlyDependsOnArgument():890:890 -> Z
     boolean lambda$fullyRemovePhiUser$1(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi) -> a
     boolean lambda$fullyRemoveUser$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:14:void constrainType(com.android.tools.r8.ir.code.ValueTypeConstraint,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.Reporter):57:70 -> a
@@ -50376,8 +50160,7 @@
     1541:1541:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1203 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1542:1542:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1203:1203 -> a
-    1:15:boolean onlyDependsOnArgument():878:892 -> a0
-    16:16:boolean onlyDependsOnArgument():890:890 -> a0
+    1:1:com.android.tools.r8.ir.code.ValueType outType():790:790 -> a0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> b
     1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):467:471 -> b
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():412:412 -> b
@@ -50399,67 +50182,72 @@
     41:42:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1060 -> b
     43:50:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1060:1067 -> b
     51:51:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1192:1192 -> b
-    1:1:com.android.tools.r8.ir.code.ValueType outType():790:790 -> b0
+    1:1:int requiredRegisters():263:263 -> b0
     1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):504:505 -> c
-    3:4:void clearPhiUsers():518:519 -> c
-    5:6:void removePhiUser(com.android.tools.r8.ir.code.Phi):528:529 -> c
-    7:7:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1107:1107 -> c
-    1:1:int requiredRegisters():263:263 -> c0
+    3:4:void clearUsers():509:510 -> c
+    5:6:void com.android.tools.r8.ir.code.Value.clearPhiUsers():518:519 -> c
+    5:6:void clearUsers():511 -> c
+    7:8:void clearUsers():512:513 -> c
+    9:10:void removePhiUser(com.android.tools.r8.ir.code.Phi):528:529 -> c
+    11:11:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1107:1107 -> c
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():357:358 -> c0
     1:1:int compareTo(java.lang.Object):53:53 -> compareTo
-    1:5:void clearUsers():509:513 -> d
-    6:10:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):546:550 -> d
-    11:11:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1121:1121 -> d
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():357:358 -> d0
+    1:5:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):546:550 -> d
+    6:11:void clearUsersInfo():558:563 -> d
+    12:12:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1121:1121 -> d
+    1:4:java.util.Set uniquePhiUsers():395:398 -> d0
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> e
     1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):499:500 -> e
-    3:8:void clearUsersInfo():558:563 -> e
-    1:4:java.util.Set uniquePhiUsers():395:398 -> e0
+    3:3:void computeNeedsRegister():717:717 -> e
+    4:11:boolean com.android.tools.r8.ir.code.Value.internalComputeNeedsRegister():722:729 -> e
+    4:11:void computeNeedsRegister():718 -> e
+    12:12:void computeNeedsRegister():718:718 -> e
+    1:4:java.util.Set uniqueUsers():346:349 -> e0
     boolean isPhi() -> f
     1:4:void linkTo(com.android.tools.r8.ir.code.Value):293:296 -> f
-    1:4:java.util.Set uniqueUsers():346:349 -> f0
-    1:1:void replaceUsers(com.android.tools.r8.ir.code.Value):588:588 -> g
-    1:2:boolean usedInMonitorOperation():485:486 -> g0
-    3:3:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> g0
-    3:3:boolean usedInMonitorOperation():486 -> g0
+    1:2:boolean usedInMonitorOperation():485:486 -> f0
+    3:3:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> f0
+    3:3:boolean usedInMonitorOperation():486 -> f0
+    1:2:void replacePhiUsers(com.android.tools.r8.ir.code.Value):620:621 -> g
+    3:4:void com.android.tools.r8.ir.code.Value.clearPhiUsers():518:519 -> g
+    3:4:void replacePhiUsers(com.android.tools.r8.ir.code.Value):623 -> g
     com.android.tools.r8.ir.code.Phi asPhi() -> h
+    1:1:void replaceUsers(com.android.tools.r8.ir.code.Value):588:588 -> h
     1:1:int hashCode():756:756 -> hashCode
-    1:1:void computeNeedsRegister():717:717 -> i
-    2:9:boolean com.android.tools.r8.ir.code.Value.internalComputeNeedsRegister():722:729 -> i
-    2:9:void computeNeedsRegister():718 -> i
-    10:10:void computeNeedsRegister():718:718 -> i
+    1:1:java.util.Set debugUsers():402:402 -> i
     1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():1090:1090 -> j
-    1:1:java.util.Set debugUsers():402:402 -> k
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():390:391 -> l
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():219:219 -> m
-    2:2:com.android.tools.r8.ir.code.Value getAliasedValue():218:218 -> m
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():794:795 -> o
-    1:3:java.util.Set getDebugLocalEnds():281:283 -> p
-    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():199:200 -> q
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():702:702 -> r
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():267:267 -> s
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():326:326 -> t
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():390:391 -> k
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():219:219 -> l
+    2:2:com.android.tools.r8.ir.code.Value getAliasedValue():218:218 -> l
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():794:795 -> m
+    1:3:java.util.Set getDebugLocalEnds():281:283 -> o
+    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():199:200 -> p
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():702:702 -> q
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():267:267 -> r
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():326:326 -> s
+    1:1:int getNumber():259:259 -> t
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":788,"2":789,"3":790}}
     788:788:java.lang.String toString():761:761 -> toString
     789:789:java.lang.String toString():761:761 -> toString
     790:790:java.lang.String toString():762:762 -> toString
     764:787:java.lang.String toString():763:786 -> toString
-    1:1:int getNumber():259:259 -> u
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getPreviousConsecutive():330:330 -> v
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():319 -> v
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getPreviousConsecutive():330:330 -> u
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():319 -> u
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1094:1094 -> w
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():960:970 -> x
-    1:1:boolean hasAnyUsers():406:406 -> y
-    1:1:boolean hasDebugUsers():410:410 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.h10:
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1094:1094 -> v
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():960:970 -> w
+    1:1:boolean hasAnyUsers():406:406 -> x
+    1:1:boolean hasDebugUsers():410:410 -> y
+    1:1:boolean hasLocalInfo():271:271 -> z
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.X00:
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     java.util.Set users -> b
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):159:159 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):157:160 -> <init>
-com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.k10:
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.a10:
     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.r10:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.h10:
     com.android.tools.r8.ir.code.ValueType LONG -> e
     com.android.tools.r8.ir.code.ValueType DOUBLE -> f
     com.android.tools.r8.ir.code.ValueType INT -> c
@@ -50511,14 +50299,14 @@
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():144:144 -> d
     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 -> n
-com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.q10:
+com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.g10:
     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.t10:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.j10:
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint LONG -> g
@@ -50579,7 +50367,7 @@
     78:80:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):155:157 -> a
     81:81:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint[] values():13:13 -> b
-com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.s10:
+com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.i10:
     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
@@ -50588,9 +50376,9 @@
     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.p20:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.f20:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.A30:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.q30:
     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() -> H0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -50610,7 +50398,7 @@
     int opcode() -> j2
     boolean isCommutative() -> n2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> r2
-com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.i3:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver -> com.android.tools.r8.internal.h3:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -50622,13 +50410,13 @@
     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$PayloadData -> com.android.tools.r8.internal.h3:
+com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$PayloadData -> com.android.tools.r8.internal.g3:
     long size -> b
     short[] data -> c
     int element_width -> a
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1):17:17 -> <init>
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.I6:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.H6:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -50638,7 +50426,6 @@
     java.util.Map initializers -> o
     com.android.tools.r8.ir.code.IRCode code -> c
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder bytecodeMetadataBuilder -> r
-    com.android.tools.r8.graph.ProgramMethod method -> b
     boolean $assertionsDisabled -> s
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap openLocalVariables -> n
     java.util.Map labels -> d
@@ -50647,10 +50434,11 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap pendingLocals -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap emittedLocals -> i
     java.util.Set emittedLabels -> e
+    com.android.tools.r8.graph.DexEncodedMethod method -> b
     java.util.List localVariablesTable -> m
     1:1:void <clinit>():77:77 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):140:140 -> <init>
-    2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):92:144 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):140:140 -> <init>
+    2:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):92:144 -> <init>
     1:7:void com.android.tools.r8.ir.conversion.CfBuilder.computeInitializers():245:251 -> a
     1:7:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):148 -> a
     8:14:java.util.List com.android.tools.r8.ir.conversion.CfBuilder.computeInitializers(com.android.tools.r8.ir.code.Value):266:272 -> a
@@ -50860,42 +50648,45 @@
     367:375:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):223:231 -> a
     367:375:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):195 -> a
     376:376:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):196:196 -> a
-    377:378:void updateLocals(com.android.tools.r8.cf.code.CfLabel):557:558 -> a
-    379:384:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.endingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):74:79 -> a
-    379:384:void updateLocals(com.android.tools.r8.cf.code.CfLabel):558 -> a
-    385:385:void updateLocals(com.android.tools.r8.cf.code.CfLabel):559:559 -> a
-    386:391:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.startingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):88:93 -> a
-    386:391:void updateLocals(com.android.tools.r8.cf.code.CfLabel):560 -> a
-    392:407:void updateLocals(com.android.tools.r8.cf.code.CfLabel):561:576 -> a
-    408:413:void updateLocals(com.android.tools.r8.cf.code.CfLabel):575:580 -> a
-    414:417:boolean localsChanged():584:587 -> a
-    418:419:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):630:631 -> a
-    420:425:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):640:645 -> a
-    420:425:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633 -> a
-    426:426:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> a
-    426:426:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):645 -> a
-    426:426:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633 -> a
-    427:458:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):644:675 -> a
-    427:458:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633 -> a
-    459:459:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):634:634 -> a
-    460:460:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):650:650 -> a
-    460:460:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633 -> a
-    461:461:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):691:691 -> a
-    462:462:int getLocalRegister(com.android.tools.r8.ir.code.Value):695:695 -> a
-    463:463:void add(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Instruction):703:703 -> a
-    464:464:void com.android.tools.r8.ir.conversion.CfBuilder.add(com.android.tools.r8.cf.code.CfInstruction):699:699 -> a
-    464:464:void add(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Instruction):704 -> a
-    465:465:void add(com.android.tools.r8.cf.code.CfInstruction[]):708:708 -> a
-    466:466:boolean verifyNoMetadata(com.android.tools.r8.ir.code.Instruction):716:716 -> a
+    377:377: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):878:878 -> a
+    377:377:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):196 -> a
+    378:378:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.ir.conversion.MethodConversionOptions):196:196 -> a
+    379:380:void updateLocals(com.android.tools.r8.cf.code.CfLabel):557:558 -> a
+    381:386:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.endingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):74:79 -> a
+    381:386:void updateLocals(com.android.tools.r8.cf.code.CfLabel):558 -> a
+    387:387:void updateLocals(com.android.tools.r8.cf.code.CfLabel):559:559 -> a
+    388:393:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.graph.DebugLocalInfo.startingLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):88:93 -> a
+    388:393:void updateLocals(com.android.tools.r8.cf.code.CfLabel):560 -> a
+    394:409:void updateLocals(com.android.tools.r8.cf.code.CfLabel):561:576 -> a
+    410:415:void updateLocals(com.android.tools.r8.cf.code.CfLabel):575:580 -> a
+    416:419:boolean localsChanged():584:587 -> a
+    420:421:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):630:631 -> a
+    422:427:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):640:645 -> a
+    422:427:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633 -> a
+    428:428:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> a
+    428:428:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):645 -> a
+    428:428:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633 -> a
+    429:460:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):644:675 -> a
+    429:460:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633 -> a
+    461:461:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):634:634 -> a
+    462:462:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):650:650 -> a
+    462:462:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):633 -> a
+    463:463:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):691:691 -> a
+    464:464:int getLocalRegister(com.android.tools.r8.ir.code.Value):695:695 -> a
+    465:465:void add(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Instruction):703:703 -> a
+    466:466:void com.android.tools.r8.ir.conversion.CfBuilder.add(com.android.tools.r8.cf.code.CfInstruction):699:699 -> a
+    466:466:void add(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.code.Instruction):704 -> a
+    467:467:void add(com.android.tools.r8.cf.code.CfInstruction[]):708:708 -> a
+    468:468:boolean verifyNoMetadata(com.android.tools.r8.ir.code.Instruction):716:716 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):691:691 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.H6:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.G6:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
     1:1:void <clinit>():111:111 -> <clinit>
     1:3:void <init>():111:113 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):111:111 -> <init>
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.x8:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.w8:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -50926,10 +50717,10 @@
     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():481:481 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     4:4:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     5:5:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305 -> a
     6:8:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305:305 -> a
     10:11:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):307:308 -> a
@@ -51202,16 +50993,16 @@
     9:12:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():875:878 -> h
     1:8:int[] getTargets(int):359:366 -> i
     9:9:int[] getTargets(int):0:0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":396,"2":397,"3":398}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":395,"2":396,"3":397}}
+    395:395:int[] getTargets(int):366:366 -> i
     396:396:int[] getTargets(int):366:366 -> i
     397:397:int[] getTargets(int):366:366 -> i
-    398:398:int[] getTargets(int):366:366 -> i
     376:392:int[] getTargets(int):367:383 -> i
     393:394:int[] getTargets(int):363:364 -> i
-com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.u8:
+com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.t8:
     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.v8:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.u8:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap locals -> c
     int endOffset -> b
     int startOffset -> a
@@ -51220,7 +51011,7 @@
     13:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
     13:13:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):169 -> a
     14:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):171:176 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.w8:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.v8:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -51228,13 +51019,13 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList offsets -> d
     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>
-com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.y8:
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.x8:
     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.K8:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.J8:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -51339,7 +51130,7 @@
     6:6:void com.android.tools.r8.ir.conversion.CfState.updateState(com.android.tools.r8.ir.conversion.CfState$Snapshot):183:183 -> e
     6:6:com.android.tools.r8.ir.conversion.CfState$Slot pop():188 -> e
     1:1:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.B8:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.A8:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -51367,7 +51158,7 @@
     436:436:java.lang.String toString():419:419 -> toString
     437:437:java.lang.String toString():419:419 -> toString
     421:434:java.lang.String toString():420:433 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.C8:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.B8:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():476:476 -> <clinit>
@@ -51376,7 +51167,7 @@
     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.D8:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.C8:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():437:437 -> <clinit>
@@ -51419,7 +51210,7 @@
     3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
     3:3: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.E8:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.D8:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -51442,12 +51233,12 @@
     277:277:java.lang.String toString():272:272 -> toString
     278:278:java.lang.String toString():272:272 -> toString
     275:275:java.lang.String toString():272:272 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.H8:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.G8:
     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.F8:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.E8:
     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
@@ -51458,7 +51249,7 @@
     75:75:java.lang.String toString():72:72 -> toString
     76:76:java.lang.String toString():72:72 -> toString
     73:73:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.G8:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.F8:
     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
@@ -51469,7 +51260,7 @@
     46:46:java.lang.String toString():43:43 -> toString
     47:47:java.lang.String toString():43:43 -> toString
     44:44:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.I8:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.H8:
     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>
@@ -51483,7 +51274,7 @@
     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.J8:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.I8:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():508:508 -> <clinit>
@@ -51492,7 +51283,7 @@
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):530:531 -> a
     1:1:int maxLocal():520:520 -> b
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.ir.conversion.ClassConverter -> com.android.tools.r8.internal.I9:
+com.android.tools.r8.ir.conversion.ClassConverter -> com.android.tools.r8.internal.H9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> c
     boolean $assertionsDisabled -> e
@@ -51506,36 +51297,36 @@
     1:1:com.android.tools.r8.ir.conversion.ClassConverterResult convertClasses(java.util.concurrent.ExecutorService):57 -> a
     2:4:com.android.tools.r8.ir.conversion.ClassConverterResult convertClasses(java.util.concurrent.ExecutorService):58:60 -> a
     5:9:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):66:70 -> a
-    10:10:void com.android.tools.r8.ir.conversion.IRConverter.classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):420:420 -> a
+    10:10:void com.android.tools.r8.ir.conversion.IRConverter.classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):418:418 -> a
     10:10:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:12:void com.android.tools.r8.ir.conversion.IRConverter.classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):420:421 -> a
+    11:12:void com.android.tools.r8.ir.conversion.IRConverter.classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):418:419 -> a
     11:12:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):70 -> a
     13:70:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):71:128 -> a
-    71:75:void lambda$internalConvertClasses$1(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):118:122 -> a
+    71:71:void lambda$internalConvertClasses$0(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):102:102 -> a
+    72:76:void lambda$internalConvertClasses$1(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):118:122 -> a
     1:1:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):140:140 -> b
-    1:1:void lambda$internalConvertClasses$0(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):102:102 -> c
-com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.internal.G9:
+com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.internal.F9:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):152:152 -> <init>
     void notifyAllClassesConverted() -> a
     1:1:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):158:158 -> a
-com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.internal.H9:
+com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.internal.G9:
     java.util.Set alreadyLibraryDesugared -> f
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):176:176 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):169:169 -> <init>
     1:5:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):184:188 -> a
     6:6:void notifyAllClassesConverted():194:194 -> a
-com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.K9:
+com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.J9:
     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$Builder -> com.android.tools.r8.internal.J9:
+com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.I9:
     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
     2:2:com.android.tools.r8.ir.conversion.ClassConverterResult build():38:38 -> b
-com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.internal.de:
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> f
     java.util.Set scheduled -> c
     java.util.List nonTerminalFutures -> e
@@ -51573,7 +51364,7 @@
     1:1:void newWave():56:56 -> d
     1:6:com.android.tools.r8.utils.Timing lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):111:111 -> e
     7:8:boolean verifyNoPendingMethodProcessing():157:158 -> e
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.og:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.jg:
     boolean hasBackwardsBranch -> n
     int inRegisterCount -> l
     int outRegisterCount -> m
@@ -51737,10 +51528,10 @@
     4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):680:680 -> c
     5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():893:893 -> c
     1:1:boolean isBuildingForComparison():169:169 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.dg:
+com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.Yf:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():1293:1293 -> <clinit>
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.eg:
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.Zf:
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1062:1062 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
@@ -51748,11 +51539,11 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.fg:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.ag:
     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):1539:1541 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.bg:
     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):969:970 -> <init>
     1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):990:991 -> a
@@ -51761,7 +51552,7 @@
     1:1:int getSize():975:975 -> d
     1:1:int maxSize():985:985 -> e
     1:1:int minSize():980:980 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.hg:
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.cg:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1095:1095 -> <clinit>
@@ -51786,7 +51577,7 @@
     1:2:int getSize():1109:1110 -> d
     1:1:int maxSize():1121:1121 -> e
     1:1:int minSize():1115:1115 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.ig:
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.dg:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1226:1226 -> <clinit>
@@ -52014,7 +51805,7 @@
     1:1:int getSize():1361:1361 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.jg:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.eg:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
@@ -52034,7 +51825,7 @@
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.kg:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.fg:
     boolean $assertionsDisabled -> f
     int size -> e
     1:1:void <clinit>():1375:1375 -> <clinit>
@@ -52105,7 +51896,7 @@
     1:2:int getSize():1487:1488 -> d
     1:1:int maxSize():1481:1481 -> e
     1:1:int minSize():1475:1475 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.lg:
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.gg:
     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[]):1013:1019 -> <init>
@@ -52115,18 +51906,18 @@
     1:1:int getSize():1049:1049 -> d
     1:1:int maxSize():1044:1044 -> e
     1:1:int minSize():1039:1039 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.mg:
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.hg:
     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):1528:1530 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.ng:
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.ig:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> b
     int end -> d
     int start -> c
     1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1511:1514 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1519:1519 -> a
     1:1:int compareTo(java.lang.Object):1505:1505 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.ch:
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.Xg:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.graph.DexMethod originalMethod -> m
@@ -52203,14 +51994,14 @@
     114:122:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):415 -> a
     123:123:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexCode$Try):422:422 -> a
     124:125:void lambda$getCurrentCatchHandlers$0(java.util.List,java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):419:420 -> a
-    126:126:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):446:446 -> a
+    126:127:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):445:446 -> a
+    128:136:void com.android.tools.r8.ir.conversion.DexSourceCode.forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):427:435 -> a
+    128:136:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):446 -> a
+    137:137:void lambda$getTryHandlerOffsets$1(java.util.List,com.android.tools.r8.graph.DexType,java.lang.Integer):446:446 -> a
     1:1:boolean verifyRegister(int):103:103 -> b
     2:8:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):144:150 -> b
     9:14:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):148:153 -> b
     15:15:boolean verifyCurrentInstructionCanThrow():211:211 -> b
-    16:17:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):445:446 -> b
-    18:26:void com.android.tools.r8.ir.conversion.DexSourceCode.forEachTryRange(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):427:435 -> b
-    18:26:java.util.List getTryHandlerOffsets(com.android.tools.r8.graph.DexCode$Try,com.android.tools.r8.graph.DexItemFactory):446 -> b
     1:8:void setUp():129:136 -> c
     9:9:com.android.tools.r8.ir.code.CatchHandlers getCurrentCatchHandlers(com.android.tools.r8.ir.conversion.IRBuilder):182:182 -> c
     10:10:int instructionIndex(int):283:283 -> c
@@ -52221,7 +52012,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():205:205 -> e
     1:4:int getMoveExceptionRegister(int):187:190 -> f
     1:1:int instructionOffset(int):288:288 -> g
-com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.pj:
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.kj:
     long value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -52231,26 +52022,25 @@
     4:4:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):34:34 -> a
     1:5:boolean equals(java.lang.Object):39:43 -> equals
     1:1:int hashCode():48:48 -> hashCode
-com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.qj:
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.lj:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory) -> a
     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.rj:
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.mj:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexType):22:23 -> <init>
-    1:11:java.util.List computeExtraUnusedNullParameters(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):28:38 -> a
-    12:13:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):45:46 -> a
-    14:14:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):51:51 -> a
-    15:15:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):56:56 -> a
-    1:1:boolean equals(java.lang.Object):61:61 -> equals
-com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Uj:
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
+    1:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):29:30 -> a
+    3:3:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):35:35 -> a
+    4:4:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):40:40 -> a
+    1:1:boolean equals(java.lang.Object):45:45 -> equals
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Pj:
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
     void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType) -> a
     void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.nn:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.jn:
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
     com.android.tools.r8.ir.code.Value previousLocalValue -> w
@@ -52260,6 +52050,7 @@
     java.util.List impreciseInstructions -> z
     com.android.tools.r8.ir.code.Value receiverValue -> s
     java.util.List debugLocalEnds -> x
+    int $r8$clinit -> E
     com.android.tools.r8.graph.AppView appView -> o
     com.android.tools.r8.ir.code.IRMetadata metadata -> C
     java.util.Set processedSubroutineInstructions -> e
@@ -52368,596 +52159,564 @@
     165:189:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):919:943 -> a
     165:189:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():878 -> a
     165:189:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    190:194:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):942:946 -> a
-    190:194:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():878 -> a
-    190:194:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    195:196:void com.android.tools.r8.ir.conversion.IRBuilder.addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):520:521 -> a
-    195:196:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):947 -> a
-    195:196:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():878 -> a
-    195:196:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    197:204:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():879:886 -> a
-    197:204:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    205:228:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():885:908 -> a
-    205:228:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    229:232:void com.android.tools.r8.ir.conversion.IRBuilder.closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2555:2558 -> a
-    229:232:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():908 -> a
-    229:232:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    233:234:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():911:912 -> a
-    233:234:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    235:235:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():868:868 -> a
-    235:235:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
-    236:236:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):663:663 -> a
-    237:238:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():807:808 -> a
-    237:238:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    239:244:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):814:819 -> a
-    239:244:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    239:244:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    245:245:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():304:304 -> a
-    245:245:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
-    245:245:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    245:245:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    246:252:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):836:842 -> a
-    246:252:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
-    246:252:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    246:252:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    253:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):859:860 -> a
-    253:254:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):843 -> a
-    253:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
-    253:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    253:254:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    255:255:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    255:255:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):860 -> a
-    255:255:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):843 -> a
-    255:255:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
-    255:255:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    255:255:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    256:257:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):861:862 -> a
-    256:257:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):843 -> a
-    256:257:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
-    256:257:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    256:257:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    258:258:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):860:860 -> a
-    258:258:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):843 -> a
-    258:258:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
-    258:258:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    258:258:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    259:266:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):847:854 -> a
-    259:266:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
-    259:266:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    259:266:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    267:273:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819:825 -> a
-    267:273:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    267:273:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    274:274:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):822:822 -> a
-    274:274:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
-    274:274:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
-    275:281:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():774:780 -> a
-    275:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    282:282:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():39:39 -> a
-    282:282:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():781 -> a
+    190:195:void com.android.tools.r8.ir.conversion.IRBuilder.processMoveExceptionItem(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):942:947 -> a
+    190:195:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():878 -> a
+    190:195:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
+    196:203:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():879:886 -> a
+    196:203:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
+    204:227:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():885:908 -> a
+    204:227:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
+    228:231:void com.android.tools.r8.ir.conversion.IRBuilder.closeCurrentBlockWithFallThrough(com.android.tools.r8.ir.code.BasicBlock):2555:2558 -> a
+    228:231:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():908 -> a
+    228:231:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
+    232:233:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():911:912 -> a
+    232:233:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
+    234:234:void com.android.tools.r8.ir.conversion.IRBuilder.processWorklist():868:868 -> a
+    234:234:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):660 -> a
+    235:235:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):663:663 -> a
+    236:237:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():807:808 -> a
+    236:237:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    238:243:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):814:819 -> a
+    238:243:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    238:243:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    244:244:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():304:304 -> a
+    244:244:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
+    244:244:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    244:244:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    245:251:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):836:842 -> a
+    245:251:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
+    245:251:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    245:251:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    252:253:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):859:860 -> a
+    252:253:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):843 -> a
+    252:253:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
+    252:253:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    252:253:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    254:254:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    254:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):860 -> a
+    254:254:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):843 -> a
+    254:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
+    254:254:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    254:254:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    255:256:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):861:862 -> a
+    255:256:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):843 -> a
+    255:256:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
+    255:256:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    255:256:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    257:257:boolean com.android.tools.r8.ir.conversion.IRBuilder.trivialGotoBlockPotentiallyWithMoveException(com.android.tools.r8.ir.code.BasicBlock):860:860 -> a
+    257:257:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):843 -> a
+    257:257:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
+    257:257:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    257:257:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    258:265:int com.android.tools.r8.ir.conversion.IRBuilder.nonSplitPredecessorCount(com.android.tools.r8.ir.code.BasicBlock):847:854 -> a
+    258:265:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819 -> a
+    258:265:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    258:265:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    266:272:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):819:825 -> a
+    266:272:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    266:272:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    273:273:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors(com.android.tools.r8.ir.code.BasicBlock):822:822 -> a
+    273:273:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyFilledPredecessors():808 -> a
+    273:273:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):668 -> a
+    274:280:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():774:780 -> a
+    274:280:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
+    281:281:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():39:39 -> a
+    281:281:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():781 -> a
+    281:281:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
+    282:282:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():782:782 -> a
     282:282:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    283:283:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():782:782 -> a
+    283:283:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    283:283:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():783 -> a
     283:283:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    284:284:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    284:284:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():783 -> a
+    284:284:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():784:784 -> a
     284:284:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    285:285:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():784:784 -> a
+    285:285:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    285:285:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():786 -> a
     285:285:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    286:286:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    286:286:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():786 -> a
-    286:286:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    287:292:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():787:792 -> a
-    287:292:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    293:293:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
-    293:293:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():793 -> a
-    293:293:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    294:296:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():794:796 -> a
-    294:296:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    297:297:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
-    297:297:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():797 -> a
+    286:291:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():787:792 -> a
+    286:291:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
+    292:292:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
+    292:292:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():793 -> a
+    292:292:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
+    293:295:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():794:796 -> a
+    293:295:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
+    296:296:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
+    296:296:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():797 -> a
+    296:296:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
+    297:297:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
+    297:297:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():798 -> a
     297:297:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    298:298:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
-    298:298:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():798 -> a
+    298:298:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():39:39 -> a
+    298:298:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():799 -> a
     298:298:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    299:299:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():39:39 -> a
-    299:299:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():799 -> a
-    299:299:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
-    300:301:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):674:675 -> a
+    299:300:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):674:675 -> a
+    301:301:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    301:301:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):675 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     302:302:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
     302:302:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):675 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    303:303:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
-    303:303:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):675 -> a
-    304:305:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676:677 -> a
-    306:306:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
-    306:306:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):678 -> a
-    307:312:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):679:684 -> a
-    313:313:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
-    313:313:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):685 -> a
-    314:315:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):692:693 -> a
-    316:346:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2643:2673 -> a
-    316:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    347:347:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
-    347:347:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2673 -> a
+    303:304:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):676:677 -> a
+    305:305:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():39:39 -> a
+    305:305:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):678 -> a
+    306:311:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):679:684 -> a
+    312:312:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):39:39 -> a
+    312:312:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):685 -> a
+    313:314:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):692:693 -> a
+    315:345:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2643:2673 -> a
+    315:345:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
+    346:346:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    346:346:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2673 -> a
+    346:346:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
+    347:347:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2673:2673 -> a
     347:347:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    348:348:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2673:2673 -> a
-    348:348:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    349:363:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2672:2686 -> a
-    349:363:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    364:375:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):572:583 -> a
-    364:375:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2690 -> a
-    364:375:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    376:376:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2691:2691 -> a
+    348:362:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2672:2686 -> a
+    348:362:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
+    363:374:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):572:583 -> a
+    363:374:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2690 -> a
+    363:374:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
+    375:375:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2691:2691 -> a
+    375:375:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
+    376:376:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2649:2649 -> a
     376:376:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    377:377:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2649:2649 -> a
+    377:377:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    377:377:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2649 -> a
     377:377:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    378:378:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    378:378:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    378:378:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
     378:378:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2649 -> a
     378:378:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    379:379:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    379:379:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    379:379:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2649 -> a
-    379:379:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    380:424:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2649:2693 -> a
-    380:424:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
-    425:439:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):701:715 -> a
-    440:440:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1246:1246 -> a
-    440:440:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):718 -> a
-    441:444:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):719:722 -> a
-    445:445:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():750:750 -> a
-    445:445:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):726 -> a
-    446:451:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):726:731 -> a
-    452:452:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():750:750 -> a
-    452:452:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731 -> a
-    453:455:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731:733 -> a
-    456:456:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    456:456:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):733 -> a
-    457:457:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):733:733 -> a
-    458:458:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
-    459:459:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
-    459:459:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729 -> a
-    460:460:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
-    461:474:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):724:737 -> a
-    475:486: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
-    475:486:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    475:486:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    487:488:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):817:818 -> a
-    487:488:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    487:488: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
-    487:488:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    487:488:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    489:494:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):827:832 -> a
-    489:494:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):818 -> a
-    489:494:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    489:494: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
-    489:494:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    489:494:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    495:496:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):820:821 -> a
-    495:496:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    495:496: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
-    495:496:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    495:496:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    497:498:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):840:841 -> a
-    497:498:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):821 -> a
-    497:498:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    497:498: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
-    497:498:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    497:498:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    499:507: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
-    499:507:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    499:507:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    508:509:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):817:818 -> a
-    508:509:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    508:509: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
-    508:509:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    508:509:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    510:515:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):827:832 -> a
-    510:515:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):818 -> a
-    510:515:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    510:515: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
-    510:515:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    510:515:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    516:517:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):820:821 -> a
-    516:517:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    516:517: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
-    516:517:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    516:517:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    518:519:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):840:841 -> a
-    518:519:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):821 -> a
-    518:519:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
-    518:519: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
-    518:519:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    518:519:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    520:524: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
-    520:524:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
-    520:524:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    525:525: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
+    379:423:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2649:2693 -> a
+    379:423:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):698 -> a
+    424:438:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):701:715 -> a
+    439:439:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1246:1246 -> a
+    439:439:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):718 -> a
+    440:443:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):719:722 -> a
+    444:444:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():750:750 -> a
+    444:444:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):726 -> a
+    445:450:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):726:731 -> a
+    451:451:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():750:750 -> a
+    451:451:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731 -> a
+    452:454:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):731:733 -> a
+    455:455:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    455:455:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):733 -> a
+    456:456:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):733:733 -> a
+    457:457:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
+    458:458:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
+    458:458:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729 -> a
+    459:459:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
+    460:473:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):724:737 -> a
+    474:485: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
+    474:485:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    474:485:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    486:487:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):817:818 -> a
+    486:487:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    486:487: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
+    486:487:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    486:487:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    488:493:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):827:832 -> a
+    488:493:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):818 -> a
+    488:493:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    488:493: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
+    488:493:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    488:493:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    494:495:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):820:821 -> a
+    494:495:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    494:495: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
+    494:495:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    494:495:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    496:497:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):840:841 -> a
+    496:497:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):821 -> a
+    496:497:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    496:497: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
+    496:497:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    496:497:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    498:506: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
+    498:506:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    498:506:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    507:508:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):817:818 -> a
+    507:508:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    507:508: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
+    507:508:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    507:508:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    509:514:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.graph.DexItemFactory):827:832 -> a
+    509:514:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):818 -> a
+    509:514:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    509:514: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
+    509:514:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    509:514:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    515:516:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):820:821 -> a
+    515:516:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    515:516: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
+    515:516:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    515:516:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    517:518:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.graph.DexItemFactory):840:841 -> a
+    517:518:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.getStringHashValueFromJump(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):821 -> a
+    517:518:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils.isComparisonOfStringHashValue(com.android.tools.r8.ir.code.JumpInstruction,com.android.tools.r8.graph.DexItemFactory):854 -> a
+    517:518: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
+    517:518:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    517:518:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    519:523: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
+    519:523:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):110 -> a
+    519:523:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    524:524: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
+    524:524:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    525:525: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
+    525:525: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
+    525:525:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
     525:525:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    526:526: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
-    526:526: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
-    526:526:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
-    526:526:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    527:529: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
-    527:529:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
-    527:529:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    530:531: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
-    530:531:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
-    532:536:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):740:744 -> a
-    537:538:boolean allPhisAreStackMapPhis(com.android.tools.r8.ir.code.IRCode):754:755 -> a
-    539:539:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):763:763 -> a
-    540:540:void resolveAndBuildSwitch(int,int,int):952:952 -> a
-    541:542:void add(com.android.tools.r8.ir.code.Instruction):966:967 -> a
-    543:544:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1044:1045 -> a
-    545:547:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2132:2134 -> a
-    545:547:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1048 -> a
-    548:548:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
+    526:528: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
+    526:528:void com.android.tools.r8.ir.conversion.StringSwitchConverter.convertToStringSwitchInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):114 -> a
+    526:528:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    529:530: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
+    529:530:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):737 -> a
+    531:535:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):740:744 -> a
+    536:537:boolean allPhisAreStackMapPhis(com.android.tools.r8.ir.code.IRCode):754:755 -> a
+    538:538:void constrainType(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.ValueTypeConstraint):763:763 -> a
+    539:539:void resolveAndBuildSwitch(int,int,int):952:952 -> a
+    540:541:void add(com.android.tools.r8.ir.code.Instruction):966:967 -> a
+    542:543:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1044:1045 -> a
+    544:546:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2132:2134 -> a
+    544:546:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1048 -> a
+    547:547:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
+    547:547:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1021 -> a
+    547:547:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1049 -> a
+    548:548:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
+    548:548:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
     548:548:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1021 -> a
     548:548:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1049 -> a
-    549:549:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    549:549:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
-    549:549:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1021 -> a
+    549:549:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1021:1021 -> a
     549:549:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1049 -> a
-    550:550:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1021:1021 -> a
-    550:550:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1049 -> a
-    551:551:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1050:1050 -> a
-    552:569:void addDebugPosition(com.android.tools.r8.ir.code.Position):1055:1072 -> a
-    570:573:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1116:1119 -> a
-    574:574:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():750:750 -> a
-    574:574:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1119 -> a
-    575:580:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1120:1125 -> a
-    581:581:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    581:581:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1125 -> a
-    582:582:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1125:1125 -> a
-    583:603:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):160:180 -> a
-    583:603:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
-    604:604:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):175:175 -> a
-    604:604:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
-    605:609:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):169:173 -> a
-    605:609:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
-    610:610:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):171:171 -> a
+    550:550:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1050:1050 -> a
+    551:568:void addDebugPosition(com.android.tools.r8.ir.code.Position):1055:1072 -> a
+    569:572:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1116:1119 -> a
+    573:573:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():750:750 -> a
+    573:573:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1119 -> a
+    574:579:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1120:1125 -> a
+    580:580:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    580:580:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1125 -> a
+    581:581:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1125:1125 -> a
+    582:602:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):160:180 -> a
+    582:602:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
+    603:603:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):175:175 -> a
+    603:603:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
+    604:608:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):169:173 -> a
+    604:608:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
+    609:609:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):171:171 -> a
+    609:609:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
+    610:610:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):167:167 -> a
     610:610:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
-    611:611:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):167:167 -> a
-    611:611:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
-    612:625:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):165:178 -> a
-    612:625:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
-    626:646:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):160:180 -> a
-    626:646:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
-    647:647:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):175:175 -> a
-    647:647:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
-    648:652:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):169:173 -> a
-    648:652:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
-    653:653:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):171:171 -> a
+    611:624:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):165:178 -> a
+    611:624:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1126 -> a
+    625:645:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):160:180 -> a
+    625:645:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
+    646:646:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):175:175 -> a
+    646:646:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
+    647:651:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):169:173 -> a
+    647:651:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
+    652:652:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):171:171 -> a
+    652:652:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
+    653:653:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):167:167 -> a
     653:653:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
-    654:654:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):167:167 -> a
-    654:654:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
-    655:668:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):165:178 -> a
-    655:668:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
-    669:672:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1131:1134 -> a
-    673:676:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):767:770 -> a
-    673:676:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1135 -> a
-    677:677:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1137:1137 -> a
-    678:682:void addArrayLength(int,int):1141:1145 -> a
-    683:688:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1168:1173 -> a
-    683:688:void addCheckCast(int,com.android.tools.r8.graph.DexType):1160 -> a
-    689:689:void com.android.tools.r8.ir.code.CheckCast.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):40:40 -> a
-    689:689:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1173 -> a
-    689:689:void addCheckCast(int,com.android.tools.r8.graph.DexType):1160 -> a
-    690:691:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1174:1175 -> a
-    690:691:void addCheckCast(int,com.android.tools.r8.graph.DexType):1160 -> a
-    692:695:void addConst(com.android.tools.r8.ir.analysis.type.TypeElement,int,long):1188:1191 -> a
-    696:697:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1305:1306 -> a
-    698:698:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2352:2352 -> a
-    698:698:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1308 -> a
-    699:710:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1309:1320 -> a
-    711:712:void addNop():1346:1347 -> a
-    713:723:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1383:1393 -> a
-    713:723:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1426 -> a
-    724:727:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1428:1431 -> a
-    728:733:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1397:1402 -> a
-    728:733:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1432 -> a
-    734:735:void com.android.tools.r8.ir.conversion.IRBuilder.addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):520:521 -> a
-    734:735:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1402 -> a
-    734:735:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1432 -> a
-    736:736:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1403:1403 -> a
-    736:736:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1432 -> a
-    737:738:void com.android.tools.r8.ir.conversion.IRBuilder.addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):520:521 -> a
-    737:738:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1403 -> a
-    737:738:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1432 -> a
-    739:739:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1404:1404 -> a
-    739:739:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1432 -> a
-    740:750:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1383:1393 -> a
-    740:750:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1453 -> a
-    751:751:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1455:1455 -> a
-    752:757:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1397:1402 -> a
-    752:757:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1456 -> a
-    758:759:void com.android.tools.r8.ir.conversion.IRBuilder.addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):520:521 -> a
-    758:759:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1402 -> a
-    758:759:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1456 -> a
-    760:760:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1403:1403 -> a
-    760:760:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1456 -> a
-    761:762:void com.android.tools.r8.ir.conversion.IRBuilder.addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):520:521 -> a
-    761:762:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1403 -> a
-    761:762:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1456 -> a
-    763:763:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1404:1404 -> a
-    763:763:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1456 -> a
-    764:768:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1461:1465 -> a
-    769:775:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1463:1469 -> a
-    776:780:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1473:1477 -> a
-    781:790: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):1503:1512 -> a
-    791:803: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):1506:1518 -> a
-    804:808: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):1528:1532 -> a
-    809:812: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):1531:1534 -> a
-    813:814:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1561:1562 -> a
-    815:815:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    815:815:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
+    654:667:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.IRBuilder.fromMemberType(com.android.tools.r8.ir.code.MemberType):165:178 -> a
+    654:667:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1129 -> a
+    668:671:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1131:1134 -> a
+    672:675:void com.android.tools.r8.ir.conversion.IRBuilder.addImpreciseInstruction(com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction):767:770 -> a
+    672:675:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1135 -> a
+    676:676:void addArrayGet(com.android.tools.r8.ir.code.MemberType,int,int,int):1137:1137 -> a
+    677:681:void addArrayLength(int,int):1141:1145 -> a
+    682:687:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1168:1173 -> a
+    682:687:void addCheckCast(int,com.android.tools.r8.graph.DexType):1160 -> a
+    688:688:void com.android.tools.r8.ir.code.CheckCast.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):40:40 -> a
+    688:688:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1173 -> a
+    688:688:void addCheckCast(int,com.android.tools.r8.graph.DexType):1160 -> a
+    689:690:void com.android.tools.r8.ir.conversion.IRBuilder.internalAddCheckCast(int,com.android.tools.r8.graph.DexType,boolean):1174:1175 -> a
+    689:690:void addCheckCast(int,com.android.tools.r8.graph.DexType):1160 -> a
+    691:694:void addConst(com.android.tools.r8.ir.analysis.type.TypeElement,int,long):1188:1191 -> a
+    695:696:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1305:1306 -> a
+    697:697:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2352:2352 -> a
+    697:697:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1308 -> a
+    698:709:void addMove(com.android.tools.r8.ir.code.ValueTypeConstraint,int,int):1309:1320 -> a
+    710:711:void addNop():1346:1347 -> a
+    712:722:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1383:1393 -> a
+    712:722:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1426 -> a
+    723:726:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1428:1431 -> a
+    727:734:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1397:1404 -> a
+    727:734:void addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int,int):1432 -> a
+    735:745:void com.android.tools.r8.ir.conversion.IRBuilder.addTrivialIf(int,int):1383:1393 -> a
+    735:745:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1453 -> a
+    746:746:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1455:1455 -> a
+    747:754:void com.android.tools.r8.ir.conversion.IRBuilder.addNonTrivialIf(com.android.tools.r8.ir.code.If,int,int):1397:1404 -> a
+    747:754:void addIfZero(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueTypeConstraint,int,int,int):1456 -> a
+    755:759:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1461:1465 -> a
+    760:766:void addInstanceGet(int,int,com.android.tools.r8.graph.DexField):1463:1469 -> a
+    767:771:void addInstanceOf(int,int,com.android.tools.r8.graph.DexType):1473:1477 -> a
+    772: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,boolean):1503:1512 -> a
+    782:794: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):1506:1518 -> a
+    795:799: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):1528:1532 -> a
+    800:803: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):1531:1534 -> a
+    804:805:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1561:1562 -> a
+    806:806:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
+    806:806:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    816:816:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    816:816:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
-    817:817:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():129:129 -> a
-    817:817:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
-    817:817:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
-    818:818:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    818:818:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
-    819:819:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():133:133 -> a
-    819:819:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
-    819:819:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
-    820:820:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
-    820:820:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
-    821:833:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1566:1578 -> a
-    834:838:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1583:1587 -> a
-    839:842:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1586:1589 -> a
-    843:866:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1600:1623 -> a
-    867:875:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1627:1635 -> a
-    876:876:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isWide():32:32 -> a
-    876:876:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1636 -> a
-    877:883:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1637:1643 -> a
-    884:908:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1664:1688 -> a
-    909:909:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1719:1719 -> a
-    910:910:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    910:910:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1719 -> a
-    911:915:void addNewArrayFilledData(int,int,long,short[]):1790:1794 -> a
-    916:919:void addStaticGet(int,com.android.tools.r8.graph.DexField):1848:1851 -> a
-    920:926:void addStaticGet(int,com.android.tools.r8.graph.DexField):1849:1855 -> a
-    927:970:void addSwitch(int,int[],int,int[]):1887:1930 -> a
-    971:971:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    971:971:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    971:971:void addSwitch(int,int[],int,int[]):1935 -> a
-    972:972:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
-    972:972:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
-    972:972:void addSwitch(int,int[],int,int[]):1936 -> a
-    973:981: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[]):1943:1951 -> a
-    973:981:void addSwitch(int,int[],int,int[]):1937 -> a
-    982:983:void com.android.tools.r8.ir.conversion.IRBuilder.addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):520:521 -> a
-    982:983: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[]):1951 -> a
-    982:983:void addSwitch(int,int[],int,int[]):1937 -> a
-    984:994: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[]):1952:1962 -> a
-    984:994:void addSwitch(int,int[],int,int[]):1937 -> a
-    995:996:void com.android.tools.r8.ir.conversion.IRBuilder.addToWorklist(com.android.tools.r8.ir.code.BasicBlock,int):520:521 -> a
-    995:996: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[]):1962 -> a
-    995:996:void addSwitch(int,int[],int,int[]):1937 -> a
-    997:1007: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[]):1963:1973 -> a
-    997:1007:void addSwitch(int,int[],int,int[]):1937 -> a
-    1008:1008:void addSwitch(int,int[],int,int[]):1938:1938 -> a
-    1009:1010: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):2143:2144 -> a
-    1011:1030: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):2159:2178 -> a
-    1011:1030: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):2147 -> a
-    1031:1041:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2250:2260 -> a
-    1031:1041: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):2183 -> a
-    1031:1041: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):2147 -> a
-    1042:1042:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
-    1042:1042:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2260 -> a
-    1042:1042: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):2183 -> a
-    1042:1042: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):2147 -> a
-    1043:1044:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2260:2261 -> a
-    1043:1044: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):2183 -> a
-    1043:1044: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):2147 -> a
-    1045:1045:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
-    1045:1045:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
-    1045:1045: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):2183 -> a
-    1045:1045: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):2147 -> a
-    1046:1046:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261:2261 -> a
-    1046:1046: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):2183 -> a
-    1046:1046: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):2147 -> a
-    1047:1057:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():161:171 -> a
-    1047:1057:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
-    1047:1057: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):2183 -> a
-    1047:1057: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):2147 -> a
-    1058:1058:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():167:167 -> a
-    1058:1058:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
-    1058: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):2183 -> a
-    1058: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):2147 -> a
-    1059:1059:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():165:165 -> 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):2261 -> 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):2183 -> 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):2147 -> a
-    1060:1060:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():163:163 -> a
-    1060:1060:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
-    1060:1060: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):2183 -> a
-    1060:1060: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):2147 -> a
-    1061:1062:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2262:2263 -> a
-    1061: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):2183 -> a
-    1061: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):2147 -> a
-    1063:1063:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
-    1063:1063:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2263 -> 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):2183 -> 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):2147 -> a
-    1064:1081:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2263:2280 -> a
-    1064: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):2183 -> a
-    1064: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):2147 -> a
-    1082:1082:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2251:2251 -> a
-    1082:1082: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):2183 -> a
-    1082:1082: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):2147 -> a
-    1083:1085:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2242:2244 -> a
-    1083: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):2185 -> a
-    1083: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):2147 -> a
-    1086:1108: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
-    1086:1108: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 -> a
-    1086:1108: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):2147 -> a
-    1109:1109: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
-    1109:1109: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 -> a
-    1109:1109: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):2147 -> a
-    1110:1110: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
-    1110:1110: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 -> a
-    1110:1110: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):2147 -> a
-    1111:1111: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
-    1111:1111: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 -> a
-    1111:1111: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):2147 -> a
-    1112:1124: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
-    1112:1124: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 -> a
-    1112:1124: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):2147 -> a
-    1125:1125: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
-    1125:1125: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 -> a
-    1125:1125: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):2147 -> a
-    1126:1126: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
-    1126:1126: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 -> a
-    1126:1126: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):2147 -> a
-    1127:1127: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
-    1127:1127: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 -> a
-    1127:1127: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):2147 -> a
-    1128: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):2187:2187 -> a
-    1128: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):2147 -> a
-    1129:1129:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():750:750 -> a
-    1129:1129: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):2189 -> a
-    1129:1129: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):2147 -> a
-    1130:1151: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):2189:2210 -> a
-    1130:1151: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):2147 -> a
-    1152:1188: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):2201:2237 -> a
-    1152:1188: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):2147 -> a
-    1189:1189:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
-    1189:1189:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1077 -> a
-    1190:1190:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
-    1190:1190:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1078 -> a
-    1191:1191: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):2344:2344 -> a
-    1191:1191:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1079 -> a
-    1192:1194:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1080:1082 -> a
-    1195:1195:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
-    1195:1195:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1179 -> a
+    807:807:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
+    807:807:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
+    808:808:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticPut():129:129 -> a
+    808:808:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
+    808:808:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
+    809:809:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
+    809:809:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
+    810:810:boolean com.android.tools.r8.graph.DexMethodHandle$MethodHandleType.isStaticGet():133:133 -> a
+    810:810:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298 -> a
+    810:810:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
+    811:811:boolean com.android.tools.r8.graph.DexMethodHandle.isStaticHandle():298:298 -> a
+    811:811:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1565 -> a
+    812:824:void addInvokeCustomRange(com.android.tools.r8.graph.DexCallSite,int,int):1566:1578 -> a
+    825:829:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1583:1587 -> a
+    830:833:void addInvokeCustom(com.android.tools.r8.graph.DexCallSite,java.util.List,java.util.List):1586:1589 -> a
+    834:857:void addInvokeRegisters(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int[]):1600:1623 -> a
+    858:866:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1627:1635 -> a
+    867:867:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isWide():32:32 -> a
+    867:867:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1636 -> a
+    868:874:void addInvokeNewArray(com.android.tools.r8.graph.DexType,int,int[]):1637:1643 -> a
+    875:899:void addInvokeRange(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProto,int,int):1664:1688 -> a
+    900:914:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1692:1706 -> a
+    915:915:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1719:1719 -> a
+    916:916:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    916:916:boolean lambda$addMoveException$2(com.android.tools.r8.ir.code.BasicBlock):1719 -> a
+    917:921:void addNewArrayFilledData(int,int,long,short[]):1790:1794 -> a
+    922:926:void addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1806:1810 -> a
+    927:930:void addStaticGet(int,com.android.tools.r8.graph.DexField):1848:1851 -> a
+    931:937:void addStaticGet(int,com.android.tools.r8.graph.DexField):1849:1855 -> a
+    938:981:void addSwitch(int,int[],int,int[]):1887:1930 -> a
+    982:982:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    982:982:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    982:982:void addSwitch(int,int[],int,int[]):1935 -> a
+    983:983:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray(int[]):167:167 -> a
+    983:983:int[] com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntCollection.toIntArray():155 -> a
+    983:983:void addSwitch(int,int[],int,int[]):1936 -> a
+    984:1014: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[]):1943:1973 -> a
+    984:1014:void addSwitch(int,int[],int,int[]):1937 -> a
+    1015:1015:void addSwitch(int,int[],int,int[]):1938:1938 -> a
+    1016:1017: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):2143:2144 -> a
+    1018: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):2159:2178 -> a
+    1018: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):2147 -> a
+    1038:1048:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2250:2260 -> a
+    1038:1048: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):2183 -> a
+    1038:1048: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):2147 -> a
+    1049:1049:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isPrecise():36:36 -> a
+    1049:1049:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2260 -> a
+    1049:1049: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):2183 -> a
+    1049:1049: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):2147 -> a
+    1050:1051:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2260:2261 -> a
+    1050:1051: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):2183 -> a
+    1050:1051: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):2147 -> a
+    1052:1052:boolean com.android.tools.r8.ir.code.ValueTypeConstraint.isObject():24:24 -> a
+    1052:1052:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    1052:1052: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):2183 -> a
+    1052:1052: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):2147 -> a
+    1053:1053:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261:2261 -> a
+    1053:1053: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):2183 -> a
+    1053:1053: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):2147 -> a
+    1054:1064:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():161:171 -> a
+    1054:1064:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    1054: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):2183 -> a
+    1054: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):2147 -> a
+    1065:1065:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():167:167 -> a
+    1065:1065:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> 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):2183 -> 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):2147 -> a
+    1066:1066:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():165:165 -> a
+    1066:1066:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    1066:1066: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):2183 -> a
+    1066:1066: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):2147 -> a
+    1067:1067:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement com.android.tools.r8.ir.code.ValueTypeConstraint.toPrimitiveType():163:163 -> a
+    1067:1067:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2261 -> a
+    1067:1067: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):2183 -> a
+    1067:1067: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):2147 -> a
+    1068:1069:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2262:2263 -> a
+    1068:1069: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):2183 -> a
+    1068:1069: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):2147 -> a
+    1070:1070:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
+    1070:1070:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2263 -> a
+    1070:1070: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):2183 -> a
+    1070:1070: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):2147 -> a
+    1071:1088:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2263:2280 -> a
+    1071: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):2183 -> a
+    1071: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):2147 -> a
+    1089:1089:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.getUninitializedDebugLocalValue(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2251:2251 -> a
+    1089:1089: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):2183 -> a
+    1089:1089: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):2147 -> a
+    1090:1092:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocalAtBlock(int,com.android.tools.r8.ir.code.BasicBlock):2242:2244 -> a
+    1090:1092: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):2185 -> a
+    1090:1092: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):2147 -> a
+    1093:1115: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
+    1093:1115: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 -> a
+    1093:1115: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):2147 -> a
+    1116:1116: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
+    1116:1116: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 -> a
+    1116:1116: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):2147 -> a
+    1117:1117: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
+    1117:1117: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 -> a
+    1117:1117: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):2147 -> a
+    1118:1118: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
+    1118:1118: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 -> a
+    1118:1118: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):2147 -> a
+    1119:1131: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
+    1119:1131: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 -> a
+    1119:1131: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):2147 -> a
+    1132:1132: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
+    1132:1132: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 -> a
+    1132:1132: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):2147 -> a
+    1133:1133: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
+    1133:1133: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 -> a
+    1133:1133: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):2147 -> a
+    1134:1134: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
+    1134:1134: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 -> a
+    1134:1134: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):2147 -> a
+    1135:1135: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):2187:2187 -> a
+    1135:1135: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):2147 -> a
+    1136:1136:boolean com.android.tools.r8.ir.conversion.IRBuilder.canUseStackMapTypes():750:750 -> a
+    1136:1136: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):2189 -> a
+    1136:1136: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):2147 -> a
+    1137:1158: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):2189:2210 -> a
+    1137:1158: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):2147 -> a
+    1159:1195: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):2201:2237 -> a
+    1159:1195: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):2147 -> a
     1196:1196:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
-    1196:1196:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1180 -> a
-    1197:1200:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1181:1184 -> a
-    1201:1201:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
-    1201:1201:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2099 -> a
-    1202:1202: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):2344:2344 -> a
-    1202:1202:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2100 -> a
-    1203:1205:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2101:2103 -> a
-    1206:1206:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
-    1206:1206:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1758 -> a
-    1207:1207: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):2344:2344 -> a
-    1207:1207:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1759 -> a
-    1208:1210:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1760:1762 -> a
-    1211:1214:com.android.tools.r8.ir.code.Value readIntLiteral(long):2305:2308 -> a
-    1215:1216: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):2315:2316 -> a
-    1217:1218: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):2320:2321 -> a
-    1217:1218: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):2315 -> a
-    1219:1219:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2348:2348 -> a
-    1219:1219:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2109 -> a
-    1220:1224:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2110:2114 -> a
-    1225:1225:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
-    1225:1225:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2114 -> a
-    1226:1226:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    1226:1226:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
-    1226:1226:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2114 -> a
-    1227:1237:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2115:2125 -> a
-    1238:1242:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2123:2127 -> a
-    1243:1243:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2348:2348 -> a
-    1243:1243: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):2326 -> a
-    1244:1244:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2352:2352 -> a
-    1244:1244: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):2327 -> a
-    1245:1247:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2132:2134 -> a
-    1245:1247: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):2339 -> a
-    1248:1249: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):2339:2340 -> a
-    1250:1250:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2352:2352 -> a
-    1250:1250:void addBooleanNonThisArgument(int):1005 -> a
-    1251:1252:void addBooleanNonThisArgument(int):1006:1007 -> a
-    1253:1257:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1011:1015 -> a
-    1253:1257:void addBooleanNonThisArgument(int):1007 -> a
-    1258:1258:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2352:2352 -> a
-    1258:1258:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):999 -> a
-    1259:1260:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1000:1001 -> a
-    1261:1265:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1011:1015 -> a
-    1261:1265:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1001 -> a
-    1266:1266:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370:2370 -> a
-    1267:1271:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2402:2406 -> a
-    1267:1271:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370 -> a
-    1272:1272:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    1272:1272:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2406 -> a
-    1272:1272:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370 -> a
-    1273:1273:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2406:2406 -> a
-    1273:1273:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370 -> a
-    1274:1274:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2403:2403 -> a
-    1274:1274:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370 -> a
-    1275:1300:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2371:2396 -> a
-    1301:1305:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2385:2389 -> a
-    1306:1312:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2387:2393 -> a
-    1313:1316:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2460:2463 -> a
-    1313:1316:void ensureSuccessorBlock(int,int,boolean):2496 -> a
-    1317:1320:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2451:2454 -> a
-    1317:1320:void ensureSuccessorBlock(int,int,boolean):2497 -> a
-    1321:1321:void ensureSuccessorBlock(int,int,boolean):2498:2498 -> a
-    1322:1322:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):287:287 -> a
-    1322:1322:void ensureSuccessorBlock(int,int,boolean):2500 -> a
+    1196:1196:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1077 -> a
+    1197:1197:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1197:1197:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1078 -> a
+    1198:1198: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):2344:2344 -> a
+    1198:1198:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1079 -> a
+    1199:1201:void addAdd(com.android.tools.r8.ir.code.NumericType,int,int,int):1080:1082 -> a
+    1202:1202:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1202:1202:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1179 -> a
+    1203:1203:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1203:1203:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1180 -> a
+    1204:1207:void addCmp(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Cmp$Bias,int,int,int):1181:1184 -> a
+    1208:1208:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1208:1208:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2099 -> a
+    1209:1209: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):2344:2344 -> a
+    1209:1209:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2100 -> a
+    1210:1212:void addConversion(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,int,int):2101:2103 -> a
+    1213:1213:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> a
+    1213:1213:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1758 -> a
+    1214:1214: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):2344:2344 -> a
+    1214:1214:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1759 -> a
+    1215:1217:void addNeg(com.android.tools.r8.ir.code.NumericType,int,int):1760:1762 -> a
+    1218:1221:com.android.tools.r8.ir.code.Value readIntLiteral(long):2305:2308 -> 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,com.android.tools.r8.graph.DebugLocalInfo):2315:2316 -> a
+    1224:1225: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):2320:2321 -> a
+    1224:1225: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):2315 -> a
+    1226:1226:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2348:2348 -> a
+    1226:1226:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2109 -> a
+    1227:1231:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2110:2114 -> a
+    1232:1232:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
+    1232:1232:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2114 -> a
+    1233:1233:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
+    1233:1233:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
+    1233:1233:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2114 -> a
+    1234:1244:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2115:2125 -> a
+    1245:1249:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2123:2127 -> a
+    1250:1250:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2348:2348 -> a
+    1250:1250: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):2326 -> a
+    1251:1251:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2352:2352 -> a
+    1251:1251: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):2327 -> a
+    1252:1254:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2132:2134 -> a
+    1252:1254: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):2339 -> a
+    1255:1256: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):2339:2340 -> a
+    1257:1257:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2352:2352 -> a
+    1257:1257:void addBooleanNonThisArgument(int):1005 -> a
+    1258:1259:void addBooleanNonThisArgument(int):1006:1007 -> a
+    1260:1264:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1011:1015 -> a
+    1260:1264:void addBooleanNonThisArgument(int):1007 -> a
+    1265:1265:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getOutgoingLocal(int):2352:2352 -> a
+    1265:1265:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):999 -> a
+    1266:1267:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1000:1001 -> a
+    1268:1272:void com.android.tools.r8.ir.conversion.IRBuilder.addNonThisArgument(com.android.tools.r8.ir.code.Argument):1011:1015 -> a
+    1268:1272:void addNonThisArgument(int,com.android.tools.r8.ir.analysis.type.TypeElement):1001 -> a
+    1273:1273:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370:2370 -> a
+    1274:1278:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2402:2406 -> a
+    1274:1278:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370 -> a
+    1279:1279:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    1279:1279:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2406 -> a
+    1279:1279:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370 -> a
+    1280:1280:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2406:2406 -> a
+    1280:1280:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370 -> a
+    1281:1281:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyOutValueType(com.android.tools.r8.ir.code.Instruction):2403:2403 -> a
+    1281:1281:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2370 -> a
+    1282:1307:void addInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Position):2371:2396 -> a
+    1308:1312:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2385:2389 -> a
+    1313:1319:void lambda$addInstruction$3(java.util.List,java.util.Set,com.android.tools.r8.graph.DexType,java.lang.Integer):2387:2393 -> a
+    1320:1323:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.ensureBlock(int):2460:2463 -> a
+    1320:1323:void ensureSuccessorBlock(int,int,boolean):2496 -> a
+    1324:1327:int com.android.tools.r8.ir.conversion.IRBuilder.getBlockStartOffset(int):2451:2454 -> a
+    1324:1327:void ensureSuccessorBlock(int,int,boolean):2497 -> a
+    1328:1328:void ensureSuccessorBlock(int,int,boolean):2498:2498 -> a
+    1329:1329:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):287:287 -> a
+    1329:1329:void ensureSuccessorBlock(int,int,boolean):2500 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1323:1323:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):287:287 -> a
-    1323:1323:void ensureSuccessorBlock(int,int,boolean):2500 -> a
-    1324:1324:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):283:283 -> a
-    1324:1324:void ensureSuccessorBlock(int,int,boolean):2501 -> a
-    1325:1325:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):300:300 -> a
-    1325:1325:void ensureSuccessorBlock(int,int,boolean):2503 -> a
+    1330:1330:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalSuccessor(int):287:287 -> a
+    1330:1330:void ensureSuccessorBlock(int,int,boolean):2500 -> a
+    1331:1331:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addNormalPredecessor(int):283:283 -> a
+    1331:1331:void ensureSuccessorBlock(int,int,boolean):2501 -> a
+    1332:1332:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):300:300 -> a
+    1332:1332:void ensureSuccessorBlock(int,int,boolean):2503 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1326:1326:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):300:300 -> a
-    1326:1326:void ensureSuccessorBlock(int,int,boolean):2503 -> a
-    1327:1327:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):296:296 -> a
-    1327:1327:void ensureSuccessorBlock(int,int,boolean):2504 -> a
-    1328:1328:void ensureSuccessorBlock(int,int,boolean):2506:2506 -> a
-    1329:1332:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2545:2548 -> a
-    1333:1333:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2547:2547 -> a
-    1334:1336:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2562:2564 -> a
-    1334:1336:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1337:1337:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2532:2532 -> a
-    1337:1337:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2524 -> a
-    1337:1337:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2564 -> a
-    1337:1337:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1338:1338:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2520:2520 -> a
-    1338:1338:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2524 -> a
-    1338:1338:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2564 -> a
-    1338:1338:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1339:1339:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2565:2565 -> a
-    1339:1339:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1340:1340:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():315:315 -> a
-    1340:1340:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2566 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1340:1340:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1341:1342:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():315:316 -> a
-    1341:1342:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2566 -> a
-    1341:1342:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1343:1343:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2569:2569 -> a
-    1343:1343:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1344:1344:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2520:2520 -> a
-    1344:1344:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2570 -> a
+    1333:1333:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalSuccessor(int):300:300 -> a
+    1333:1333:void ensureSuccessorBlock(int,int,boolean):2503 -> a
+    1334:1334:void com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.addExceptionalPredecessor(int):296:296 -> a
+    1334:1334:void ensureSuccessorBlock(int,int,boolean):2504 -> a
+    1335:1335:void ensureSuccessorBlock(int,int,boolean):2506:2506 -> a
+    1336:1339:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2545:2548 -> a
+    1340:1340:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2547:2547 -> a
+    1341:1343:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2562:2564 -> a
+    1341:1343:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1344:1344:int com.android.tools.r8.ir.conversion.IRBuilder.getOffset(com.android.tools.r8.ir.code.BasicBlock):2532:2532 -> a
+    1344:1344:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2524 -> a
+    1344:1344:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2564 -> a
     1344:1344:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1345:1345:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():304:304 -> a
-    1345:1345:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2571 -> a
+    1345:1345:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2520:2520 -> a
+    1345:1345:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(com.android.tools.r8.ir.code.BasicBlock):2524 -> a
+    1345:1345:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2564 -> a
     1345:1345:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1346:1346:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():304:304 -> a
-    1346:1346:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2571 -> a
+    1346:1346:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2565:2565 -> a
     1346:1346:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1347:1357:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2574:2584 -> a
-    1347:1357:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1358:1366:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2581:2589 -> a
-    1358:1366:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1367:1372: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):2605:2610 -> a
-    1367:1372:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2589 -> a
-    1367:1372:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1373:1380:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2590:2597 -> a
-    1373:1380:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1381:1383:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():308:310 -> a
-    1381:1383:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2600 -> a
-    1381:1383:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1384:1384:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2600:2600 -> a
-    1384:1384:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
-    1385:1386:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2550:2551 -> a
-    1387:1387:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2699:2699 -> a
+    1347:1347:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():315:315 -> a
+    1347:1347:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2566 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1347:1347:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1348:1349:boolean com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.hasMoreThanASingleNormalExit():315:316 -> a
+    1348:1349:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2566 -> a
+    1348:1349:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1350:1350:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2569:2569 -> a
+    1350:1350:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1351:1351:com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo com.android.tools.r8.ir.conversion.IRBuilder.getBlockInfo(int):2520:2520 -> a
+    1351:1351:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2570 -> a
+    1351:1351:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1352:1352:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():304:304 -> a
+    1352:1352:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2571 -> a
+    1352:1352:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    1353:1353:int com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.predecessorCount():304:304 -> a
+    1353:1353:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2571 -> a
+    1353:1353:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1354:1364:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2574:2584 -> a
+    1354:1364:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1365:1373:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2581:2589 -> a
+    1365:1373:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1374:1379: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):2605:2610 -> a
+    1374:1379:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2589 -> a
+    1374:1379:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1380:1387:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2590:2597 -> a
+    1380:1387:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1388:1390:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo.allSuccessors():308:310 -> a
+    1388:1390:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2600 -> a
+    1388:1390:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1391:1391:void com.android.tools.r8.ir.conversion.IRBuilder.generateSplitEdgeBlocks():2600:2600 -> a
+    1391:1391:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2549 -> a
+    1392:1393:void closeCurrentBlock(com.android.tools.r8.ir.code.JumpInstruction):2550:2551 -> a
+    1394:1394:boolean isIntegerType(com.android.tools.r8.ir.code.NumericType):2699:2699 -> 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):1149 -> 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
@@ -52995,37 +52754,37 @@
     79:83:void addGoto(int):1375:1379 -> b
     84:87:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1481:1484 -> b
     88:88:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1647:1647 -> b
-    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     89:89:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1647 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:90:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    90:90:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     90:90:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1647 -> b
     91:97:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1647:1653 -> b
-    98:112:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1692:1706 -> b
-    113:113:void checkInvokeArgumentRegisters(int,int):1711:1711 -> b
-    114:114:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    114:114:void checkInvokeArgumentRegisters(int,int):1711 -> b
-    115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
-    115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    115:115:void checkInvokeArgumentRegisters(int,int):1711 -> b
-    116:116:void checkInvokeArgumentRegisters(int,int):1711:1711 -> b
-    117:117:void addReturn():1830:1830 -> b
-    118:120:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1835:1837 -> b
-    118:120:void addReturn():1830 -> b
-    121:124:void addStaticPut(int,com.android.tools.r8.graph.DexField):1859:1862 -> b
-    125:125:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> b
-    125:125:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1766 -> b
-    126:126: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):2344:2344 -> b
-    126:126:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1767 -> b
-    127:130:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1769:1772 -> b
-    131:134:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2289:2292 -> b
-    131:134:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1772 -> b
-    135:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLongLiteral(long):2298:2301 -> b
-    135:138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2293 -> b
-    135:138:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1772 -> b
-    139:142:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1773:1776 -> b
-    143:143:void addInstruction(com.android.tools.r8.ir.code.Instruction):2366:2366 -> b
-    144:144:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2703:2703 -> b
+    98:98:void checkInvokeArgumentRegisters(int,int):1711:1711 -> b
+    99:99:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
+    99:99:void checkInvokeArgumentRegisters(int,int):1711 -> b
+    100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
+    100:100:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
+    100:100:void checkInvokeArgumentRegisters(int,int):1711 -> b
+    101:101:void checkInvokeArgumentRegisters(int,int):1711:1711 -> b
+    102:108:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1780:1786 -> b
+    109:109:void addReturn():1830:1830 -> b
+    110:112:void com.android.tools.r8.ir.conversion.IRBuilder.addReturn(com.android.tools.r8.ir.code.Return):1835:1837 -> b
+    110:112:void addReturn():1830 -> b
+    113:116:void addStaticPut(int,com.android.tools.r8.graph.DexField):1859:1862 -> b
+    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readNumericRegister(int,com.android.tools.r8.ir.code.NumericType):2285:2285 -> b
+    117:117:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1766 -> b
+    118:118: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):2344:2344 -> b
+    118:118:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1767 -> b
+    119:122:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1769:1772 -> b
+    123:126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2289:2292 -> b
+    123:126:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1772 -> b
+    127:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLongLiteral(long):2298:2301 -> b
+    127:130:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readLiteral(com.android.tools.r8.ir.code.ValueTypeConstraint,long):2293 -> b
+    127:130:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1772 -> b
+    131:134:void addNot(com.android.tools.r8.ir.code.NumericType,int,int):1773:1776 -> b
+    135:135:void addInstruction(com.android.tools.r8.ir.code.Instruction):2366:2366 -> b
+    136:136:boolean isNonLongIntegerType(com.android.tools.r8.ir.code.NumericType):2703:2703 -> b
     1:1:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1096:1096 -> c
     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):2285:2285 -> c
     2:2:void addAnd(com.android.tools.r8.ir.code.NumericType,int,int,int):1097 -> c
@@ -53047,14 +52806,13 @@
     21:21:void addMoveException(int):1723 -> c
     22:22:boolean com.android.tools.r8.ir.conversion.IRBuilder.verifyValueIsMoveException(com.android.tools.r8.ir.code.Value):1732:1732 -> c
     22:22:void addMoveException(int):1723 -> c
-    23:29:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1780:1786 -> c
-    30:33:void addInitClass(int,com.android.tools.r8.graph.DexType):1841:1844 -> c
-    34:49:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2411:2426 -> c
-    50:50:void ensureExceptionalSuccessorBlock(int,int):2514:2514 -> c
-    51:52:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2536:2537 -> c
-    53:53:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):526:526 -> c
-    53:53:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2538 -> c
-    54:56:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2539:2541 -> c
+    23:26:void addInitClass(int,com.android.tools.r8.graph.DexType):1841:1844 -> c
+    27:42:void attachLocalValues(com.android.tools.r8.ir.code.Instruction):2411:2426 -> c
+    43:43:void ensureExceptionalSuccessorBlock(int,int):2514:2514 -> c
+    44:45:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2536:2537 -> c
+    46:46:void com.android.tools.r8.ir.conversion.IRBuilder.setCurrentBlock(com.android.tools.r8.ir.code.BasicBlock):526:526 -> c
+    46:46:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2538 -> c
+    47:49:void closeCurrentBlockGuaranteedNotToNeedEdgeSplitting():2539:2541 -> c
     1:1:java.util.List getArgumentValues():511:511 -> d
     2:2:void lambda$allPhisAreStackMapPhis$1(com.android.tools.r8.ir.code.Instruction):757:757 -> d
     3:3:void addAndLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):1106:1106 -> d
@@ -53075,8 +52833,7 @@
     19:19:void addMoveResult(int):1750 -> d
     20:23:void addMoveResult(int):1751:1754 -> d
     24:28:void addNewInstance(int,com.android.tools.r8.graph.DexType):1798:1802 -> d
-    29:33:void addNewUnboxedEnumInstance(int,com.android.tools.r8.graph.DexType,int):1806:1810 -> d
-    34:34:void ensureNormalSuccessorBlock(int,int):2510:2510 -> d
+    29:29:void ensureNormalSuccessorBlock(int,int):2510:2510 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getCFG():507:507 -> e
     2:2:boolean lambda$build$0(com.android.tools.r8.ir.code.Instruction):677:677 -> e
     3:3:void resolveAndBuildNewArrayFilledData(int,int):957:957 -> e
@@ -53281,7 +53038,7 @@
     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):2344:2344 -> v
     8:8:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2091 -> v
     9:12:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2092:2095 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.in:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.en:
     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
@@ -53289,10 +53046,10 @@
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:7:void <init>():274:280 -> <init>
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":376,"2":377,"3":379}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":376,"2":377,"3":378}}
     376:376:java.lang.String toString():344:344 -> toString
     377:377:java.lang.String toString():344:344 -> toString
-    379:379:java.lang.String toString():346:346 -> toString
+    378:378:java.lang.String toString():346:346 -> toString
     347:351:java.lang.String toString():346:350 -> toString
     352:352:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> toString
     352:352:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
@@ -53306,7 +53063,7 @@
     370:370:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
     370:370:java.lang.String toString():364 -> toString
     371:375:java.lang.String toString():364:368 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.jn:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.fn:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -53315,7 +53072,7 @@
     1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):198:198 -> a
     1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):198:198 -> b
     1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):198:198 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.kn:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.gn:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -53323,13 +53080,13 @@
     1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):213:213 -> a
     1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):213:213 -> b
     1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):213:213 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.ln:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.hn:
     java.util.List values -> a
     1:3:void <init>():236:238 -> <init>
     1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):244:246 -> a
     1:9:boolean equals(java.lang.Object):258:266 -> equals
     1:1:int hashCode():253:253 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.mn:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.in:
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
@@ -53338,471 +53095,470 @@
     2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):191:194 -> <init>
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):186:186 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):186:186 -> b
-com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.internal.wn:
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> A
+com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.internal.sn:
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> E
+    boolean $assertionsDisabled -> N
     com.android.tools.r8.graph.AppView appView -> a
-    com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> p
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
-    com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> w
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> G
+    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> p
+    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> D
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> G
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> g
-    com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer enumValueOptimizer -> z
+    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> B
     com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> j
-    com.android.tools.r8.ir.optimize.NaturalIntLoopRemover naturalIntLoopRemover -> o
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> q
+    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> w
     com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> i
-    com.android.tools.r8.ir.optimize.Inliner inliner -> s
-    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> t
+    java.util.Set prunedMethodsInWave -> J
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection instructionDesugaring -> e
-    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> y
-    com.android.tools.r8.graph.DexString highestSortingString -> I
+    java.util.List onWaveDoneActions -> I
     com.android.tools.r8.ir.optimize.outliner.Outliner outliner -> c
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis fieldAccessAnalysis -> f
-    java.util.concurrent.atomic.AtomicBoolean seenNeverMergePrefix -> N
-    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> v
+    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> C
+    java.util.concurrent.atomic.AtomicBoolean seenNotNeverMergePrefix -> L
+    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> t
+    com.android.tools.r8.ir.optimize.AssumeInserter assumeInserter -> A
+    java.util.List neverMergePrefixes -> K
     com.android.tools.r8.utils.CfgPrinter printer -> m
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> F
-    boolean $assertionsDisabled -> O
+    com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> o
+    com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> v
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> k
-    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> E
-    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> q
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> H
-    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> C
+    com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer enumValueOptimizer -> y
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> F
     com.android.tools.r8.utils.InternalOptions options -> l
-    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> x
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> r
+    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> s
+    com.android.tools.r8.ir.optimize.Inliner inliner -> r
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> n
-    java.util.List onWaveDoneActions -> J
-    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> D
+    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> x
+    com.android.tools.r8.graph.DexString highestSortingString -> H
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
-    com.android.tools.r8.ir.optimize.AssumeInserter assumeInserter -> B
-    java.util.Set prunedMethodsInWave -> K
-    java.util.concurrent.atomic.AtomicBoolean seenNotNeverMergePrefix -> M
-    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> u
-    java.util.List neverMergePrefixes -> L
-    1:1:void <clinit>():127:127 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):186:186 -> <init>
-    2:168:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):146:312 -> <init>
-    169:169:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):317:317 -> <init>
+    java.util.concurrent.atomic.AtomicBoolean seenNeverMergePrefix -> M
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> z
+    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> u
+    1:1:void <clinit>():126:126 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):184:184 -> <init>
+    2:146:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):166:310 -> <init>
+    147:147:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):315:315 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$24(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
     1:1:java.lang.String lambda$new$0(java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":209,"2":210,"3":211}}
-    209:209:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    210:210:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    211:211:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    206:206:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    207:207:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> a
-    207:207:java.lang.String lambda$new$0(java.lang.String):205 -> a
-    208:208:java.lang.String lambda$new$0(java.lang.String):205:205 -> a
-    212:213:void com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover.run(com.android.tools.r8.graph.AppView):17:18 -> a
-    212:213:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):356 -> a
-    214:227:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):357:370 -> a
-    228:232:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):397:401 -> a
-    228:232:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):372 -> a
-    233:237:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):398:402 -> a
-    233:237:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):372 -> a
-    238:238:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):374:374 -> a
-    239:243:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):397:401 -> a
-    239:243:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):376 -> a
-    244:248:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):398:402 -> a
-    244:248:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):376 -> a
-    249:251:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):379:381 -> a
-    252:252:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
-    252:252:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):381 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":207,"2":208,"3":209}}
+    207:207:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    208:208:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    209:209:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    204:204:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    205:205:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):380:380 -> a
+    205:205:java.lang.String lambda$new$0(java.lang.String):203 -> a
+    206:206:java.lang.String lambda$new$0(java.lang.String):203:203 -> a
+    210:211:void com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover.run(com.android.tools.r8.graph.AppView):17:18 -> a
+    210:211:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):354 -> a
+    212:225:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):355:368 -> a
+    226:230:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):395:399 -> a
+    226:230:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):370 -> a
+    231:235:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):396:400 -> a
+    231:235:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):370 -> a
+    236:236:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):372:372 -> a
+    237:241:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):395:399 -> a
+    237:241:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):374 -> a
+    242:246:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):396:400 -> a
+    242:246:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):374 -> a
+    247:249:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):377:379 -> a
+    250:250:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
+    250:250:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):379 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    253:253:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
-    253:253:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):381 -> a
-    254:254:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):382:382 -> a
-    255:256:void com.android.tools.r8.ir.conversion.IRConverter.processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):349:350 -> a
-    255:256:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):384 -> a
-    257:263:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):386:392 -> a
-    264:264:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):389:389 -> a
-    265:269:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):331:335 -> a
-    270:270:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):333:333 -> a
-    271:271:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):447:447 -> a
-    272:275: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,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):49:52 -> a
-    272:275:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):448 -> a
-    276:286:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):449:459 -> a
-    287:295:void com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring.rewriteEnclosingLambdaMethodAttributes(com.android.tools.r8.graph.AppView,java.util.Map):17:25 -> a
-    287:295:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):458 -> a
-    296:296:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):461:461 -> a
-    297:299:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):467:469 -> a
-    300:308:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):468:476 -> a
-    309:309:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):471:471 -> a
-    310:310:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):473:473 -> a
-    311:311:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):484:484 -> a
-    312:312:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:767 -> a
-    312:312:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):484 -> a
+    251:251:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
+    251:251:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):379 -> a
+    252:252:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):380:380 -> a
+    253:254:void com.android.tools.r8.ir.conversion.IRConverter.processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):347:348 -> a
+    253:254:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):382 -> a
+    255:261:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):384:390 -> a
+    262:262:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):387:387 -> a
+    263:267:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):329:333 -> a
+    268:268:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):331:331 -> a
+    269:269:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):445:445 -> a
+    270:273: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,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):49:52 -> a
+    270:273:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):446 -> a
+    274:284:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):447:457 -> a
+    285:293:void com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring.rewriteEnclosingLambdaMethodAttributes(com.android.tools.r8.graph.AppView,java.util.Map):17:25 -> a
+    285:293:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):456 -> a
+    294:294:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):459:459 -> a
+    295:297:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):465:467 -> a
+    298:306:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):466:474 -> a
+    307:307:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):469:469 -> a
+    308:308:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):471:471 -> a
+    309:309:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):482:482 -> a
+    310:310:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:767 -> a
+    310:310:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):482 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    313:315:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:769 -> a
-    313:315:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):484 -> a
-    316:347:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):486:517 -> a
-    348:348:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1949:1949 -> a
-    348:348:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):517 -> a
+    311:313:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:769 -> a
+    311:313:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):482 -> a
+    314:345:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):484:515 -> a
+    346:346:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1937:1937 -> a
+    346:346:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):515 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    352:352:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1953:1953 -> a
-    352:352:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):517 -> a
-    353:353: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
-    353:353:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1954 -> a
-    353:353:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):517 -> a
-    354:354:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):516:516 -> a
-    355:358: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):526:529 -> a
-    359:359:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1949:1949 -> a
-    359:359: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 -> a
+    350:350:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1941:1941 -> a
+    350:350:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):515 -> a
+    351:351: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
+    351:351:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1942 -> a
+    351:351:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):515 -> a
+    352:352:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):514:514 -> a
+    353:356: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:527 -> a
+    357:357:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1937:1937 -> a
+    357:357: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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    363:363:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1953:1953 -> a
-    363:363: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 -> a
-    364:364: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
-    364:364:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1954 -> a
-    364:364: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 -> a
-    365:371: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:534 -> a
-    372:376:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):569:573 -> a
-    372:376: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
-    377:377:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    377:377:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):573 -> a
-    377:377: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
-    378:401:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):574:597 -> a
-    378:401: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
-    402:402:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    402:402:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):597 -> a
-    402:402: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
-    403:405:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):605:607 -> a
-    403:405: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
-    406:418:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):599:611 -> a
-    406:418: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
-    419:419:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    419:419:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):611 -> a
-    419:419: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
-    420:420:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    420:420:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    420:420:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):611 -> a
-    420:420: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
-    421:421:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):611:611 -> a
-    421:421: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
-    422:422: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):538:538 -> a
-    423:423:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    423:423: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):538 -> a
+    361:361:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1941:1941 -> a
+    361:361: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
+    362:362: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
+    362:362:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1942 -> a
+    362:362: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
+    363:369: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):526:532 -> a
+    370:374:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):567:571 -> a
+    370:374: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):535 -> a
+    375:375:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    375:375:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):571 -> a
+    375:375: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):535 -> a
+    376:399:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):572:595 -> a
+    376:399: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):535 -> a
+    400:400:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    400:400:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):595 -> a
+    400:400: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):535 -> a
+    401:403:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):603:605 -> a
+    401:403: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):535 -> a
+    404:416:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):597:609 -> a
+    404:416: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):535 -> a
+    417:417:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    417:417:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):609 -> a
+    417:417: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):535 -> a
+    418:418:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    418:418:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    418:418:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):609 -> a
+    418:418: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):535 -> a
+    419:419:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):609:609 -> a
+    419:419: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):535 -> a
+    420:420: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):536:536 -> a
+    421:421:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    421:421: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):536 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    424:424:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    424:424: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):538 -> a
-    425:435: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):538:548 -> a
-    436:445: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:550 -> a
-    446:446:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    446:446: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):550 -> a
+    422:422:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    422:422: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):536 -> a
+    423:433: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):536:546 -> a
+    434:443: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):539:548 -> a
+    444:444:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    444:444: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):548 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    447:447:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    447:447: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):550 -> a
-    448:448: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):551:551 -> a
-    449:455:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1709:1715 -> a
-    449:455: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):551 -> a
-    456:456:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):656:656 -> a
-    457:457:com.android.tools.r8.utils.Timing lambda$optimize$9(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):677:677 -> a
-    458:458:void lambda$optimize$10(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):715:715 -> a
-    459:459:com.android.tools.r8.utils.Timing lambda$optimize$11(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):745:745 -> a
-    460:460:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):811:811 -> a
-    461:467:void addWaveDoneAction(com.android.tools.r8.utils.Action):847:853 -> a
-    468:468:void addWaveDoneAction(com.android.tools.r8.utils.Action):851:851 -> a
-    469:469:void addWaveDoneAction(com.android.tools.r8.utils.Action):848:848 -> a
-    470:471:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):862:863 -> a
-    472:472:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexEncodedMethod):867:867 -> a
-    473:476:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):880:883 -> a
-    477:477:void clearDexMethodCompilationState():887:887 -> a
-    478:478:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):891:891 -> a
-    479:488:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):904:913 -> a
-    489:494:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):912:917 -> a
-    495:495:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> a
-    495:495:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):917 -> a
-    496:496:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):917:917 -> a
-    497:497:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):916:916 -> a
-    498:499:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):925:926 -> a
-    500:500:void lambda$optimizeSynthesizedMethod$14(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):936:936 -> a
-    501:503:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):943:945 -> a
-    504:504:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$17(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):1010:1010 -> a
-    505:510:boolean com.android.tools.r8.ir.conversion.IRConverter.desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1069:1074 -> a
-    505:510:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1020 -> a
-    505:510:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):993 -> a
-    511:516:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1021:1026 -> a
-    511:516:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):993 -> a
-    517:517:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> a
-    517:517:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1026 -> a
-    517:517:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):993 -> a
-    518:518:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1026:1026 -> a
-    518:518:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):993 -> a
-    519:525:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1022:1028 -> a
-    519:525:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):993 -> a
-    526:536: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):1086:1096 -> a
-    537:542:void com.android.tools.r8.ir.conversion.IRConverter.printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1924:1929 -> a
-    537:542:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1099 -> a
-    543:557: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):1100:1114 -> a
-    558:558:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3781:3781 -> a
-    558:558: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):1114 -> a
-    559:559:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
-    559:559:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3782 -> a
-    559:559: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):1114 -> a
-    560:562:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3783:3785 -> a
-    560:562: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):1114 -> a
-    563:563:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    563:563:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3785 -> a
-    563:563: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):1114 -> a
-    564:566:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3786:3788 -> a
-    564:566: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):1114 -> a
-    567:567:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1438:1438 -> a
+    445:445:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    445:445: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):548 -> a
+    446:446: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):549:549 -> a
+    447:453:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1704:1710 -> a
+    447:453: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):549 -> a
+    454:454:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):654:654 -> a
+    455:455:com.android.tools.r8.utils.Timing lambda$optimize$9(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):675:675 -> a
+    456:456:void lambda$optimize$10(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):713:713 -> a
+    457:457:com.android.tools.r8.utils.Timing lambda$optimize$11(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):743:743 -> a
+    458:458:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):809:809 -> a
+    459:465:void addWaveDoneAction(com.android.tools.r8.utils.Action):845:851 -> a
+    466:466:void addWaveDoneAction(com.android.tools.r8.utils.Action):849:849 -> a
+    467:467:void addWaveDoneAction(com.android.tools.r8.utils.Action):846:846 -> a
+    468:469:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):860:861 -> a
+    470:470:void lambda$computeReachabilitySensitivity$12(com.android.tools.r8.graph.DexEncodedMethod):865:865 -> a
+    471:474:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):878:881 -> a
+    475:475:void clearDexMethodCompilationState():885:885 -> a
+    476:476:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):889:889 -> a
+    477:486:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):902:911 -> a
+    487:492:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):910:915 -> a
+    493:493:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):952:952 -> a
+    493:493:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):915 -> a
+    494:494:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):915:915 -> a
+    495:495:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):914:914 -> a
+    496:497:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):923:924 -> a
+    498:498:void lambda$optimizeSynthesizedMethod$14(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):934:934 -> a
+    499:501:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):941:943 -> a
+    502:502:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$17(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):1008:1008 -> a
+    503:508:boolean com.android.tools.r8.ir.conversion.IRConverter.desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1067:1072 -> a
+    503:508:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1018 -> a
+    503:508:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):991 -> a
+    509:514:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1019:1024 -> a
+    509:514:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):991 -> a
+    515:515:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):952:952 -> a
+    515:515:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1024 -> a
+    515:515:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):991 -> a
+    516:516:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1024:1024 -> a
+    516:516:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):991 -> a
+    517:523:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(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):1020:1026 -> a
+    517:523:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$16(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):991 -> a
+    524:534: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):1084:1094 -> a
+    535:540:void com.android.tools.r8.ir.conversion.IRConverter.printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1919:1924 -> a
+    535:540: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):1097 -> a
+    541:555: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):1098:1112 -> a
+    556:556:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3781:3781 -> a
+    556:556: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):1112 -> a
+    557:557:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
+    557:557:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3782 -> a
+    557:557: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):1112 -> a
+    558:560:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3783:3785 -> a
+    558:560: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):1112 -> a
+    561:561:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    561:561:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3785 -> a
+    561:561: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):1112 -> a
+    562:564:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3786:3788 -> a
+    562:564: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):1112 -> a
+    565:565:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1436:1436 -> a
+    565:565:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
+    565:565: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):1112 -> a
+    566:566:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
+    566:566:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1436 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    566:566:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
+    566:566: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):1112 -> a
+    567:567:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
+    567:567:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1436 -> a
     567:567:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
-    567:567: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):1114 -> a
-    568:568:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
-    568:568:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1438 -> a
+    567:567: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):1112 -> a
+    568:598:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1443:1473 -> a
+    568:598:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
+    568:598: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):1112 -> a
+    599:623:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1438:1462 -> a
+    599:623:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
+    599:623: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):1112 -> a
+    624:625:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1448:1449 -> a
+    624:625:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
+    624: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):1112 -> a
+    626:628:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3789:3791 -> a
+    626:628: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):1112 -> a
+    629:629:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
+    629:629:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3790 -> a
+    629:629: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):1112 -> a
+    630: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):1113:1129 -> a
+    647:647: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4507,"2":4508,"3":4509}}
+    4507:4507: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):1129:1129 -> a
+    4508:4508: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):1129:1129 -> a
+    4509:4509: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):1129:1129 -> a
+    1778:1783: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):1131:1136 -> a
+    1784:1784: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):1134:1134 -> a
+    1785:1785: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4514,"2":4515,"3":4516}}
+    4514:4514: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):1134:1134 -> a
+    4515:4515: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):1134:1134 -> a
+    4516:4516: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):1134:1134 -> a
+    2922:2927: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):1137:1142 -> a
+    2928:2928: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4524,"2":4525,"3":4526}}
+    4524:4524: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):1142:1142 -> a
+    4525:4525: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):1142:1142 -> a
+    4526:4526: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):1142:1142 -> a
+    4073:4085: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):1145:1157 -> a
+    4086:4090:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1525:1529 -> a
+    4086:4090: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
+    4091:4091:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
+    4091:4091:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1529 -> a
+    4091:4091: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
+    4092:4093:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1529:1530 -> a
+    4092:4093: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
+    4094:4094:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    4094:4094:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1530 -> a
+    4094:4094: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
+    4095:4104: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):1161:1170 -> a
+    4105:4130: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:1188 -> a
+    4131:4131:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):94:94 -> a
+    4131:4131: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):1188 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    568:568:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
-    568:568: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):1114 -> a
-    569:569:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
-    569:569:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1438 -> a
-    569:569:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
-    569:569: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):1114 -> a
-    570:600:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1445:1475 -> a
-    570:600:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
-    570:600: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):1114 -> a
-    601:625:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1440:1464 -> a
-    601:625:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> a
-    601: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):1114 -> a
-    626:627:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1450:1451 -> a
-    626:627:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3788 -> 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):1114 -> a
-    628:630:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3789:3791 -> a
-    628: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):1114 -> a
-    631:631:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    631:631:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):3790 -> a
-    631:631: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):1114 -> a
-    632:648: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):1115:1131 -> a
-    649: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4518,"2":4519,"3":4520}}
-    4518:4518: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):1131:1131 -> a
-    4519:4519: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):1131:1131 -> a
-    4520:4520: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):1131:1131 -> a
-    1782:1787: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):1133:1138 -> a
-    1788:1788: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):1136:1136 -> a
-    1789:1789: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4525,"2":4526,"3":4527}}
-    4525:4525: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):1136:1136 -> a
-    4526:4526: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):1136:1136 -> a
-    4527:4527: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):1136:1136 -> a
-    2928:2933: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:1144 -> a
-    2934:2934: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4535,"2":4536,"3":4537}}
-    4535:4535: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):1144:1144 -> a
-    4536:4536: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):1144:1144 -> a
-    4537:4537: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):1144:1144 -> a
-    4081:4093: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):1147:1159 -> a
-    4094:4098:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1530:1534 -> a
-    4094:4098: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):1161 -> a
-    4099:4099:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
-    4099:4099:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1534 -> a
-    4099:4099: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):1161 -> a
-    4100:4101:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1534:1535 -> a
-    4100:4101: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):1161 -> a
-    4102:4102:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    4102:4102:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1535 -> a
-    4102:4102: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):1161 -> a
-    4103:4112: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:1172 -> a
-    4113:4138: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):1165:1190 -> a
-    4139:4139:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):94:94 -> a
-    4139:4139: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):1190 -> a
+    4132:4158: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):1189:1215 -> a
+    4159:4159:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
+    4159:4159: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):1215 -> a
+    4160:4160: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):1215:1215 -> a
+    4161:4161:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
+    4161:4161: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):1215 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4140:4166: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):1191:1217 -> a
-    4167:4167:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
-    4167:4167: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):1217 -> a
-    4168:4168: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):1217:1217 -> a
-    4169:4169:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
-    4169:4169: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):1217 -> a
+    4162:4162:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
+    4162:4162: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):1215 -> a
+    4163:4167: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):1216:1216 -> a
+    4173:4191: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):1222:1240 -> a
+    4192:4192: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
+    4192:4192: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):1240 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4170:4170:boolean com.android.tools.r8.graph.AppView.hasLiveness():655:655 -> a
-    4170:4170: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):1217 -> a
-    4171:4175: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):1218:1218 -> a
-    4181:4199: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):1224:1242 -> a
-    4200:4200: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
-    4200:4200: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):1242 -> a
+    4193:4193: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
+    4193:4193: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):1240 -> a
+    4194:4299: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):1241:1346 -> a
+    4300:4303:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):94:97 -> a
+    4300:4303: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):1346 -> a
+    4304:4309: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):1347:1352 -> a
+    4310:4312:void com.android.tools.r8.ir.conversion.IRConverter.invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):974:976 -> a
+    4310:4312: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):1353 -> a
+    4313:4327: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):1357:1371 -> a
+    4328:4359: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):1370:1401 -> a
+    4360:4407: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):1390:1437 -> a
+    4408:4408:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    4408:4408: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):1437 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4201:4201: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
-    4201:4201: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):1242 -> a
-    4202:4310: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):1243:1351 -> a
-    4311:4314:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):94:97 -> a
-    4311:4314: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):1351 -> a
-    4315:4320: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):1352:1357 -> a
-    4321:4323:void com.android.tools.r8.ir.conversion.IRConverter.invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):976:978 -> a
-    4321:4323: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):1358 -> a
-    4324:4338: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):1362:1376 -> a
-    4339:4370: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):1375:1406 -> a
-    4371:4418: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:1442 -> a
-    4419:4419:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    4419:4419: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):1442 -> a
+    4409:4409:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    4409:4409: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):1437 -> a
+    4410:4432: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):1438:1460 -> a
+    4433:4433:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1219:1219 -> a
+    4433:4433: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):1460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4420:4420:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    4420:4420: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):1442 -> a
-    4421:4443: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):1443:1465 -> a
-    4444:4444:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1231:1231 -> a
-    4444:4444: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):1465 -> a
+    4434:4439:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1219:1224 -> a
+    4434:4439: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):1460 -> a
+    4440:4498: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):1460:1518 -> a
+    4499:4506: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):1513:1520 -> a
+    4527:4527:void lambda$optimize$18(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1229:1229 -> a
+    4528:4528:void lambda$optimize$19(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1233:1233 -> a
+    4529:4530:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1403:1404 -> a
+    4531:4531: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):916:916 -> a
+    4531:4531:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1403 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4445:4450:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1231:1236 -> a
-    4445:4450: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):1465 -> a
-    4451:4509: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):1465:1523 -> a
-    4510:4517: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):1518:1525 -> a
-    4538:4538:void lambda$optimize$18(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1231:1231 -> a
-    4539:4539:void lambda$optimize$19(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1235:1235 -> a
-    4540:4541:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1408:1409 -> a
-    4542:4542: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):916:916 -> a
-    4542:4542:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1408 -> a
+    4532:4532: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):912:912 -> a
+    4532:4532:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1403 -> a
+    4533:4578: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1544:1589 -> a
+    4579:4579:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1570:1570 -> a
+    4579:4579: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1589 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4543:4543: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):912:912 -> a
-    4543:4543:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$20(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1408 -> a
-    4544:4589: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1549:1594 -> a
-    4590:4590:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1582:1582 -> a
-    4590:4590: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1594 -> a
+    4580:4585: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1590:1595 -> a
+    4586:4586:void lambda$collectOptimizationInfo$21(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):1545:1545 -> a
+    4587:4596:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1607:1616 -> a
+    4597:4597:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1611:1611 -> a
+    4598:4599:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1627:1628 -> a
+    4600:4600:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    4600:4600:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1628 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4591:4596: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1595:1600 -> a
-    4597:4597:void lambda$collectOptimizationInfo$21(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):1550:1550 -> a
-    4598:4607:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1612:1621 -> a
-    4608:4608:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1616:1616 -> a
-    4609:4610:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1632:1633 -> a
-    4611:4611:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    4611:4611:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1633 -> a
+    4601:4601:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    4601:4601:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1628 -> a
+    4602:4607:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(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.graph.bytecodemetadata.BytecodeMetadataProvider):1641:1646 -> a
+    4602:4607:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1629 -> a
+    4608:4608:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1631:1631 -> a
+    4609:4620:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1655:1666 -> a
+    4609:4620:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1632 -> a
+    4621:4627:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1704:1710 -> a
+    4621:4627:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1666 -> a
+    4621:4627:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1632 -> a
+    4628:4630:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1667:1669 -> a
+    4628:4630:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1632 -> a
+    4631:4631:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):952:952 -> a
+    4631:4631:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1669 -> a
+    4631:4631:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1632 -> a
+    4632:4632:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1669:1669 -> a
+    4632:4632:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1632 -> a
+    4633:4639:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1668:1674 -> a
+    4633:4639:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1632 -> a
+    4640:4640:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1679:1679 -> a
+    4641:4650:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1688:1697 -> a
+    4641:4650:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1681 -> a
+    4651:4653:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1682:1684 -> a
+    4654:4662: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):1722:1730 -> a
+    4663:4675:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3915:3927 -> a
+    4663:4675: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):1730 -> a
+    4676:4676:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
+    4676:4676:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3928 -> a
+    4676:4676: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):1730 -> a
+    4677:4678:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3928:3929 -> a
+    4677:4678: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):1730 -> a
+    4679:4694: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):1732:1747 -> a
+    4695:4695: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):1746:1746 -> a
+    4696:4710:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1804:1818 -> a
+    4711:4711:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
+    4711:4711:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongMul(com.android.tools.r8.ir.code.Instruction):1864 -> a
+    4711:4711:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1819 -> a
+    4712:4713:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongMul(com.android.tools.r8.ir.code.Instruction):1865:1866 -> a
+    4712:4713:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1819 -> a
+    4714:4714:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1822:1822 -> a
+    4715:4715:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1871:1871 -> a
+    4715:4715:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1823 -> a
+    4716:4716:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> a
+    4716:4716:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1871 -> a
+    4716:4716:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1823 -> a
+    4717:4717:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1872:1872 -> a
+    4717:4717:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1823 -> a
+    4718:4719:boolean com.android.tools.r8.ir.conversion.IRConverter.isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1876:1877 -> a
+    4718:4719:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1826 -> a
+    4720:4721:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1829:1830 -> a
+    4722:4726:boolean com.android.tools.r8.ir.conversion.IRConverter.isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1850:1854 -> a
+    4722:4726:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1831 -> a
+    4727:4732:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1832:1837 -> a
+    4733:4744:void com.android.tools.r8.ir.conversion.IRConverter.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):1886:1897 -> a
+    4733:4744:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1838 -> a
+    4745:4746:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$23(com.android.tools.r8.graph.DexItemFactory):1812:1813 -> a
+    4747:4747:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$23(com.android.tools.r8.graph.DexItemFactory):1811:1811 -> a
+    4748:4748:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1859:1859 -> a
+    4749:4749:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1935:1935 -> a
+    4750:4750:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    4750:4750:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1936 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4612:4612:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    4612:4612:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1633 -> a
-    4613:4618:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(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.graph.bytecodemetadata.BytecodeMetadataProvider):1646:1651 -> a
-    4613:4618:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1634 -> a
-    4619:4619:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1636:1636 -> a
-    4620:4631:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1660:1671 -> a
-    4620:4631:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1637 -> a
-    4632:4638:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1709:1715 -> a
-    4632:4638:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1671 -> a
-    4632:4638:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1637 -> a
-    4639:4641:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1672:1674 -> a
-    4639:4641:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1637 -> a
-    4642:4642:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> a
-    4642:4642:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1674 -> a
-    4642:4642:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1637 -> a
-    4643:4643:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1674:1674 -> a
-    4643:4643:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1637 -> a
-    4644:4650:void com.android.tools.r8.ir.conversion.IRConverter.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.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1673:1679 -> a
-    4644:4650:void finalizeIR(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.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1637 -> a
-    4651:4651:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1684:1684 -> a
-    4652:4661:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1693:1702 -> a
-    4652:4661:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1686 -> a
-    4662:4664:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1687:1689 -> a
-    4665:4673: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):1727:1735 -> a
-    4674:4686:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3915:3927 -> a
-    4674:4686: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):1735 -> a
-    4687:4687:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> a
-    4687:4687:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3928 -> a
-    4687:4687: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):1735 -> a
-    4688:4689:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3928:3929 -> a
-    4688:4689: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):1735 -> a
-    4690:4705: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):1737:1752 -> a
-    4706:4706: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:1751 -> a
-    4707:4721:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1809:1823 -> a
-    4722:4722:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
-    4722:4722:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongMul(com.android.tools.r8.ir.code.Instruction):1869 -> a
-    4722:4722:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1824 -> a
-    4723:4724:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongMul(com.android.tools.r8.ir.code.Instruction):1870:1871 -> a
-    4723:4724:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1824 -> a
-    4725:4725:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1827:1827 -> a
-    4726:4726:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1876:1876 -> a
-    4726:4726:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1828 -> a
-    4727:4727:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> a
-    4727:4727:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1876 -> a
-    4727:4727:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1828 -> a
-    4728:4728:boolean com.android.tools.r8.ir.conversion.IRConverter.isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1877:1877 -> a
-    4728:4728:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1828 -> a
-    4729:4730:boolean com.android.tools.r8.ir.conversion.IRConverter.isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1881:1882 -> a
-    4729:4730:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1831 -> a
-    4731:4732:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1834:1835 -> a
-    4733:4737:boolean com.android.tools.r8.ir.conversion.IRConverter.isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1855:1859 -> a
-    4733:4737:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1836 -> a
-    4738:4743:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1837:1842 -> a
-    4744:4755:void com.android.tools.r8.ir.conversion.IRConverter.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):1891:1902 -> a
-    4744:4755:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1843 -> a
-    4756:4757:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$23(com.android.tools.r8.graph.DexItemFactory):1817:1818 -> a
-    4758:4758:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$23(com.android.tools.r8.graph.DexItemFactory):1816:1816 -> a
-    4759:4759:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1864:1864 -> a
-    4760:4760:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1940:1940 -> a
-    4761:4761:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    4761:4761:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1941 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4762:4779:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1942:1959 -> a
-    4780:4780:void lambda$onMethodCodePruned$26(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1989:1989 -> a
+    4751:4768:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1937:1954 -> a
+    4769:4769:void lambda$onMethodCodePruned$26(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1984:1984 -> a
     boolean lambda$postProcessingDesugaringForD8$2(com.android.tools.r8.graph.ProgramMethod) -> b
-    1:1:void clearNestAttributes():344:344 -> b
-    2:10:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):429:437 -> b
-    11:14:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):436:439 -> b
-    15:15:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):472:472 -> b
-    16:21:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):618:623 -> b
-    22:22:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):622:622 -> b
-    23:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):637:637 -> b
+    1:1:void clearNestAttributes():342:342 -> b
+    2:10:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):427:435 -> b
+    11:14:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):434:437 -> b
+    15:15:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):470:470 -> b
+    16:21:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):616:621 -> b
+    22:22:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):620:620 -> b
+    23:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):635:635 -> b
     24:24:boolean com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection.isEmpty():0:0 -> b
-    24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):637 -> b
-    25:63:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):637:675 -> b
-    64:65:void com.android.tools.r8.ir.conversion.IRConverter.lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):841:842 -> b
-    64:65:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):683 -> b
-    66:80:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):684:698 -> b
-    81:85:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):408:412 -> b
-    81:85:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):701 -> b
-    86:86:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):409:409 -> b
-    86:86:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):701 -> b
-    87:144:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):706:763 -> b
-    145:149:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):408:412 -> b
-    145:149:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):767 -> b
-    150:150:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):409:409 -> b
-    150:150:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):767 -> b
-    151:156:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):770:775 -> b
-    157:190:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):774:807 -> b
-    191:195:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):816:820 -> b
-    196:196:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1582:1582 -> b
-    196:196:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):820 -> b
+    24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):635 -> b
+    25:63:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):635:673 -> b
+    64:65:void com.android.tools.r8.ir.conversion.IRConverter.lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):839:840 -> b
+    64:65:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):681 -> b
+    66:80:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):682:696 -> b
+    81:85:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):406:410 -> b
+    81:85:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):699 -> b
+    86:86:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):407:407 -> b
+    86:86:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):699 -> b
+    87:144:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):704:761 -> b
+    145:149:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):406:410 -> b
+    145:149:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):765 -> b
+    150:150:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):407:407 -> b
+    150:150:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):765 -> b
+    151:156:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):768:773 -> b
+    157:190:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):772:805 -> b
+    191:195:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):814:818 -> b
+    196:196:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1570:1570 -> b
+    196:196:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):818 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    197:208:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):821:832 -> b
-    209:215:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):828:834 -> b
-    216:216:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):865:865 -> b
+    197:208:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):819:830 -> b
+    209:215:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):826:832 -> b
+    216:216:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):863:863 -> b
     217:217:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:767 -> b
-    217:217:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):865 -> b
+    217:217:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):863 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     218:220:boolean com.android.tools.r8.graph.DexProgramClass.hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):767:769 -> b
-    218:220:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):865 -> b
-    221:222:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):866:867 -> b
-    223:223:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):875:875 -> b
-    224:224:void lambda$processMethodsConcurrently$15(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):947:947 -> b
-    225:234: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):963:972 -> b
-    235:236:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(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):990:991 -> b
-    237:237:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(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):989:989 -> b
-    238:258:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1758:1778 -> b
-    259:271:void com.android.tools.r8.ir.conversion.IRConverter.ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1908:1920 -> b
-    259:271:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1789 -> b
-    272:276:boolean lambda$workaroundForwardingInitializerBug$22(com.android.tools.r8.ir.code.Instruction):1780:1784 -> b
-    277:278:void printPhase(java.lang.String):1934:1935 -> b
-    279:279:void lambda$onMethodPruned$25(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1972:1972 -> b
-    1:1:com.android.tools.r8.ir.optimize.Inliner getInliner():325:325 -> c
-    2:3:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.graph.DexProgramClass):625:626 -> c
-    4:4:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.graph.ProgramMethod):627:627 -> c
-    5:6: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):1007:1008 -> c
-    7:7: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):1006:1006 -> c
-    1:1:boolean isInWave():857:857 -> d
-    2:11:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1036:1045 -> d
-    12:12:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> d
-    12:12:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1045 -> d
-    13:13:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1045:1045 -> d
-    14:21:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1041:1048 -> d
-    22:22:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):556:556 -> d
-    22:22:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1051 -> d
+    218:220:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):863 -> b
+    221:222:void lambda$computeReachabilitySensitivity$13(com.android.tools.r8.graph.DexProgramClass):864:865 -> b
+    223:223:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):873:873 -> b
+    224:224:void lambda$processMethodsConcurrently$15(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):945:945 -> b
+    225:234: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):961:970 -> b
+    235:236:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(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):988:989 -> b
+    237:237:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(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):987:987 -> b
+    238:258:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1753:1773 -> b
+    259:271:void com.android.tools.r8.ir.conversion.IRConverter.ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1903:1915 -> b
+    259:271:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1784 -> b
+    272:276:boolean lambda$workaroundForwardingInitializerBug$22(com.android.tools.r8.ir.code.Instruction):1775:1779 -> b
+    277:278:void printPhase(java.lang.String):1929:1930 -> b
+    279:279:void lambda$onMethodPruned$25(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1967:1967 -> b
+    1:1:com.android.tools.r8.ir.optimize.Inliner getInliner():323:323 -> c
+    2:3:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.graph.DexProgramClass):623:624 -> c
+    4:4:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.graph.ProgramMethod):625:625 -> c
+    5:6: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):1005:1006 -> c
+    7:7: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):1004:1004 -> c
+    1:1:boolean isInWave():855:855 -> d
+    2:11:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1034:1043 -> d
+    12:12:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):952:952 -> d
+    12:12:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1043 -> d
+    13:13:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1043:1043 -> d
+    14:21:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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:1046 -> d
+    22:22:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):554:554 -> d
+    22:22:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1049 -> d
     23:23:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> d
-    23:23:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):556 -> d
-    23:23:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1051 -> d
-    24:30:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):559:565 -> d
-    24:30:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1051 -> d
-    31:41:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1051:1061 -> d
-    42:43:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1052:1053 -> d
-    44:51:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1986:1993 -> d
-    1:1:void reportNestDesugarDependencies():339:339 -> e
-    2:10:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1970:1978 -> e
-    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):930:934 -> f
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.internal.hB:
+    23:23:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):554 -> d
+    23:23:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1049 -> d
+    24:30:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):557:563 -> d
+    24:30:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1049 -> d
+    31:41:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1049:1059 -> d
+    42:43:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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):1050:1051 -> d
+    44:51:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1981:1988 -> d
+    1:1:void reportNestDesugarDependencies():337:337 -> e
+    2:10:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1965:1973 -> e
+    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):928:932 -> f
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.internal.aB:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> c
@@ -53822,7 +53578,7 @@
     7:7:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.LensCodeRewriter.makeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):166:166 -> a
     7:7:com.android.tools.r8.ir.code.Value access$100(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):122 -> a
     8:19:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):235:246 -> a
-    20:40:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1234:1254 -> a
+    20:40:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.unlinkDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1233:1253 -> a
     20:40:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):248 -> a
     41:578:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):251:788 -> a
     579:579:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.TypeElement.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):96:96 -> a
@@ -53847,11 +53603,11 @@
     1143:1146:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):688:691 -> a
     1147:1147:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):690:690 -> a
     1148:1174:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):308:334 -> a
-    1175:1208:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1188:1221 -> a
+    1175:1208:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1187:1220 -> a
     1175:1208:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):334 -> a
-    1209:1209:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1212:1212 -> a
+    1209:1209:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1211:1211 -> a
     1209:1209:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):334 -> a
-    1210:1210:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect):1211:1211 -> a
+    1210:1210:void com.android.tools.r8.ir.conversion.LensCodeRewriter.checkInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeDirect) -> a
     1210:1210:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):334 -> a
     1211:1211:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):338:338 -> a
     1212:1217:void rewritePartialDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):337:342 -> a
@@ -53950,194 +53706,194 @@
     2657:2657:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$9(com.android.tools.r8.ir.code.InvokeMultiNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):692:692 -> a
     2658:2658:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$10(com.android.tools.r8.ir.code.InvokeNewArray,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):704:704 -> a
     2659:2659:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$12(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):728:728 -> a
-    2660:2666:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):961:967 -> a
-    2667:2667:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):963:963 -> a
+    2660:2666:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):960:966 -> a
+    2667:2667:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):962:962 -> a
     2668:2668:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3632,"2":3633,"3":3634}}
-    3632:3632:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):963:963 -> a
-    3633:3633:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):963:963 -> a
-    3634:3634:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):963:963 -> a
-    3631:3631:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):963:963 -> a
-    3635:3659:java.util.Deque com.android.tools.r8.ir.conversion.LensCodeRewriter.getUnappliedLenses(com.android.tools.r8.graph.ProgramMethod):972:996 -> a
-    3635:3659:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):182 -> a
-    3660:3661:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):183:184 -> a
-    3662:3662:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    3662:3662:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):184 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3631,"2":3632,"3":3633}}
+    3631:3631:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):962:962 -> a
+    3632:3632:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):962:962 -> a
+    3633:3633:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):962:962 -> a
+    3630:3630:void removeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.Set):962:962 -> a
+    3634:3658:java.util.Deque com.android.tools.r8.ir.conversion.LensCodeRewriter.getUnappliedLenses(com.android.tools.r8.graph.ProgramMethod):971:995 -> a
+    3634:3658:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):182 -> a
+    3659:3660:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):183:184 -> a
+    3661:3661:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    3661:3661:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3663:3669:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):185:191 -> a
-    3670:3678:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):190:198 -> a
-    3679:3680:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):214:215 -> a
-    3679:3680:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3681:3701:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826:846 -> a
-    3681:3701:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3681:3701:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3702:3705:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):919:922 -> a
-    3702:3705:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3702:3705:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3702:3705:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3706:3706:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
-    3706:3706:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):922 -> a
+    3662:3668:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):185:191 -> a
+    3669:3677:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):190:198 -> a
+    3678:3679:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):214:215 -> a
+    3678:3679:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3680:3700:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):826:846 -> a
+    3680:3700:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3680:3700:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3701:3704:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):918:921 -> a
+    3701:3704:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3701:3704:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3701:3704:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3705:3705:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
+    3705:3705:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):921 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3706:3706:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3706:3706:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3706:3706:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3707:3708:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):923:924 -> a
-    3707:3708:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3707:3708:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3707:3708:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3709:3709:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    3709:3709:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):924 -> a
+    3705:3705:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3705:3705:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3705:3705:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3706:3707:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):922:923 -> a
+    3706:3707:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3706:3707:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3706:3707:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3708:3708:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    3708:3708:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):923 -> a
+    3708:3708:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3708:3708:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3708:3708:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3709:3709:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3709:3709:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    3709:3709:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):923 -> a
     3709:3709:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
     3709:3709:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3709:3709:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3710:3710:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3710:3710:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    3710:3710:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):924 -> a
-    3710:3710:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3710:3710:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3710:3710:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3711:3713:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):925:927 -> a
-    3711:3713:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3711:3713:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3711:3713:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3714:3714:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):926:926 -> a
+    3710:3712:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):924:926 -> a
+    3710:3712:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3710:3712:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3710:3712:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3713:3713:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):925:925 -> a
+    3713:3713:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3713:3713:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3713:3713:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3714:3714: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
+    3714:3714:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):925 -> a
     3714:3714:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
     3714:3714:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3714:3714:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3715:3715: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
-    3715:3715:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):926 -> a
+    3715:3715:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):928:928 -> a
     3715:3715:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
     3715:3715:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3715:3715:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3716:3716:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):929:929 -> a
-    3716:3716:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3716:3716:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3716:3716:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3717:3720:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):928:931 -> a
-    3717:3720:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3717:3720:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3717:3720:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3721:3721:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    3721:3721:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):931 -> a
+    3716:3719:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):927:930 -> a
+    3716:3719:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3716:3719:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3716:3719:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3720:3720:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    3720:3720:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):930 -> a
+    3720:3720:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3720:3720:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3720:3720:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3721:3721:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3721:3721:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    3721:3721:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):930 -> a
     3721:3721:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
     3721:3721:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3721:3721:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3722:3722:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3722:3722:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    3722:3722:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):931 -> a
-    3722:3722:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3722:3722:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3722:3722:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3723:3730:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):932:939 -> a
-    3723:3730:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
-    3723:3730:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3723:3730:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3731:3731:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):853:853 -> a
+    3722:3729:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):931:938 -> a
+    3722:3729:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):841 -> a
+    3722:3729:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3722:3729:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3730:3730:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):853:853 -> a
+    3730:3730:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3730:3730:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3731:3731:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
+    3731:3731:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):855 -> a
     3731:3731:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3731:3731:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3732:3732:boolean com.android.tools.r8.graph.proto.ArgumentInfo.isRewrittenTypeInfo():0:0 -> a
-    3732:3732:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):855 -> a
+    3732:3732:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):860:860 -> a
     3732:3732:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3732:3732:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3733:3733:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):860:860 -> a
+    3733:3733:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):947:947 -> a
+    3733:3733:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):857 -> a
     3733:3733:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3733:3733:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3734:3734:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):948:948 -> a
+    3734:3734:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    3734:3734:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):947 -> a
     3734:3734:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):857 -> a
     3734:3734:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3734:3734:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3735:3735:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    3735:3735:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):948 -> a
+    3735:3735:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3735:3735:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    3735:3735:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):947 -> a
     3735:3735:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):857 -> a
     3735:3735:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3735:3735:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3736:3736:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3736:3736:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    3736:3736:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):948 -> a
+    3736:3736:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):949:949 -> a
     3736:3736:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):857 -> a
     3736:3736:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3736:3736:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3737:3737:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):950:950 -> a
+    3737:3737:com.android.tools.r8.ir.code.Argument$Builder com.android.tools.r8.ir.code.Argument.builder():36:36 -> a
+    3737:3737:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):949 -> a
     3737:3737:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):857 -> a
     3737:3737:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3737:3737:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3738:3738:com.android.tools.r8.ir.code.Argument$Builder com.android.tools.r8.ir.code.Argument.builder():36:36 -> a
-    3738:3738:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):950 -> a
-    3738:3738:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):857 -> a
-    3738:3738:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3738:3738:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3739:3743:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):951:955 -> a
-    3739:3743:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):857 -> a
-    3739:3743:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3739:3743:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3744:3747:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):863:866 -> a
-    3744:3747:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3744:3747:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3748:3748:com.android.tools.r8.ir.code.Argument$Builder com.android.tools.r8.ir.code.Argument.builder():36:36 -> a
-    3748:3748:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):866 -> a
-    3748:3748:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3748:3748:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3749:3786:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):867:904 -> a
-    3749:3786:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
-    3749:3786:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3787:3792:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):218:223 -> a
-    3787:3792:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3793:3793:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):201:201 -> a
-    3794:3797:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1006:1009 -> a
-    3798:3798:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
-    3798:3798:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1009 -> a
-    3799:3800:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1010:1011 -> a
-    3801:3801:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    3801:3801:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1011 -> a
-    3802:3802:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3802:3802:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    3802:3802:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1011 -> a
-    3803:3803:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
-    3803:3803:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1011 -> a
-    3804:3814:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1011:1021 -> a
-    3815:3815:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
-    3815:3815:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1021 -> a
-    3816:3822:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1022:1028 -> a
-    3823:3837:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1039:1053 -> a
-    3838:3838:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
-    3838:3838:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1053 -> a
-    3839:3844:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1054:1059 -> a
-    3845:3845:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3845:3845:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1059 -> a
-    3846:3846:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
-    3846:3846:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1055 -> a
-    3847:3861:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1055:1069 -> a
-    3862:3862:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
-    3862:3862:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1069 -> a
-    3863:3869:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1070:1076 -> a
-    3870:3880:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1088:1098 -> a
-    3881:3881:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
-    3881:3881:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1098 -> a
-    3882:3890:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1099:1107 -> a
-    3891:3891:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
-    3891:3891:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1107 -> a
-    3892:3894:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1108:1110 -> a
-    3895:3895:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    3895:3895:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1110 -> a
-    3896:3896:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
-    3896:3896:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1109 -> a
-    3897:3906:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1109:1118 -> a
-    3907:3914:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1123:1130 -> a
-    3915:3920:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1129:1134 -> a
-    3921:3921: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):1145:1145 -> a
-    3922:3932:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1158:1168 -> a
-    3922:3932: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):1145 -> a
-    3933:3935: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):1146:1148 -> a
-    3936:3939:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.LensCodeRewriter.defaultValueLatticeElement(com.android.tools.r8.graph.DexType):1173:1176 -> a
-    3936:3939: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):1150 -> a
-    3940:3942: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):1149:1151 -> a
+    3738:3742:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArgumentType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RewrittenTypeInfo,java.util.Set,int):950:954 -> a
+    3738:3742:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):857 -> a
+    3738:3742:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3738:3742:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3743:3746:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):863:866 -> a
+    3743:3746:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3743:3746:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3747:3747:com.android.tools.r8.ir.code.Argument$Builder com.android.tools.r8.ir.code.Argument.builder():36:36 -> a
+    3747:3747:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):866 -> a
+    3747:3747:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3747:3747:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3748:3784:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):867:903 -> a
+    3748:3784:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
+    3748:3784:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3785:3790:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):218:223 -> a
+    3785:3790:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
+    3791:3791:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):201:201 -> a
+    3792:3795:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1005:1008 -> a
+    3796:3796:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
+    3796:3796:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1008 -> a
+    3797:3798:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1009:1010 -> a
+    3799:3799:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    3799:3799:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1010 -> a
+    3800:3800:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3800:3800:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    3800:3800:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1010 -> a
+    3801:3801:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    3801:3801:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1010 -> a
+    3802:3812:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1010:1020 -> a
+    3813:3813:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
+    3813:3813:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1020 -> a
+    3814:3820:com.android.tools.r8.ir.code.InstructionListIterator insertCastForFieldAssignmentIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.graph.GraphLens$FieldLookupResult):1021:1027 -> a
+    3821:3835:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1038:1052 -> a
+    3836:3836:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
+    3836:3836:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1052 -> a
+    3837:3842:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1053:1058 -> a
+    3843:3843:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3843:3843:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1058 -> a
+    3844:3844:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    3844:3844:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1054 -> a
+    3845:3859:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1054:1068 -> a
+    3860:3860:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
+    3860:3860:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1068 -> a
+    3861:3867:com.android.tools.r8.ir.code.InstructionListIterator insertCastsForInvokeArgumentsIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):1069:1075 -> a
+    3868:3878:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1087:1097 -> a
+    3879:3879:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
+    3879:3879:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1097 -> a
+    3880:3888:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1098:1106 -> a
+    3889:3889:com.android.tools.r8.ir.code.SafeCheckCast$Builder com.android.tools.r8.ir.code.SafeCheckCast.builder():20:20 -> a
+    3889:3889:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1106 -> a
+    3890:3892:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1107:1109 -> a
+    3893:3893:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    3893:3893:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1109 -> a
+    3894:3894:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    3894:3894:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1108 -> a
+    3895:3904:com.android.tools.r8.ir.code.InstructionListIterator insertCastForReturnIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1108:1117 -> a
+    3905:3912:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1122:1129 -> a
+    3913:3918:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.GraphLens$FieldLookupResult,com.android.tools.r8.graph.ProgramMethod):1128:1133 -> a
+    3919:3919: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):1144:1144 -> a
+    3920:3930:boolean com.android.tools.r8.ir.conversion.LensCodeRewriter.defaultValueHasChanged(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1157:1167 -> a
+    3920:3930: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):1144 -> a
+    3931:3933: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):1145:1147 -> a
+    3934:3937:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.conversion.LensCodeRewriter.defaultValueLatticeElement(com.android.tools.r8.graph.DexType):1172:1175 -> a
+    3934:3937: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):1149 -> a
+    3938:3940: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):1148:1150 -> a
     boolean lambda$insertCastForReturnIfNeeded$16(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):716:716 -> b
     boolean lambda$insertCastsForInvokeArgumentsIfNeeded$15(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> c
     1:1:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):670:670 -> c
     2:2:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):32:32 -> c
     2:2:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):670 -> c
-com.android.tools.r8.ir.conversion.LensCodeRewriter$1 -> com.android.tools.r8.internal.eB:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$1 -> com.android.tools.r8.internal.XA:
     com.android.tools.r8.graph.GraphLens val$codeLens -> e
     com.android.tools.r8.ir.code.InvokeMethod val$invoke -> b
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> f
@@ -54151,7 +53907,7 @@
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> c
     5:5:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():410 -> c
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():403:403 -> k
-com.android.tools.r8.ir.conversion.LensCodeRewriter$GraphLensInterval -> com.android.tools.r8.internal.fB:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$GraphLensInterval -> com.android.tools.r8.internal.YA:
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens graphLens -> a
     com.android.tools.r8.graph.DexMethod method -> c
     com.android.tools.r8.graph.GraphLens codeLens -> b
@@ -54159,27 +53915,27 @@
     1:1:com.android.tools.r8.graph.GraphLens getCodeLens():141:141 -> a
     1:1:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens getGraphLens():137:137 -> b
     1:1:com.android.tools.r8.graph.DexMethod getMethod():145:145 -> c
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.internal.ZA:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():1257:1257 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):1265:1269 -> <init>
-    1:11:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1277:1287 -> a
+    1:1:void <clinit>():1256:1256 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set):1264:1268 -> <init>
+    1:11:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1276:1286 -> a
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    12:12:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1287 -> a
-    13:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1287:1288 -> a
+    12:12:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1286 -> a
+    13:14:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1286:1287 -> a
     15:15:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
-    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1288 -> a
-    16:17:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1288:1289 -> a
+    15:15:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1287 -> a
+    16:17:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1287:1288 -> a
     18:18:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
-    18:18:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1289 -> a
-    19:21:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1289:1291 -> a
-    22:22:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1287:1287 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.iB:
+    18:18:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1288 -> a
+    19:21:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1288:1290 -> a
+    22:22:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1286:1286 -> a
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.bB:
     java.util.Map protoFixupCache -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexDefinitionSupplier definitions -> a
@@ -54229,14 +53985,14 @@
     132:135:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType com.android.tools.r8.ir.code.Invoke$Type.toMethodHandle(com.android.tools.r8.graph.DexMethod):207:210 -> a
     132:135:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):156 -> a
     136:156:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):157:177 -> a
-    157:157:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2746:2746 -> a
+    157:157:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2744:2744 -> a
     157:157:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):178 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:7:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):81:87 -> b
-    8:8:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> b
+    8:8:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> b
     8:8:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> b
+    9:9:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> b
     9:9:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):87 -> b
     10:11:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):89:90 -> b
     12:13:java.util.List com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.rewriteBootstrapArguments(java.util.List,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):188:189 -> b
@@ -54292,12 +54048,12 @@
     57:60:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):114:117 -> b
     57:60:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
     61:65:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):93:97 -> b
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.r8.internal.pB:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.r8.internal.iB:
     com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):26:28 -> <init>
     1:4:boolean isClassLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):32:35 -> a
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.internal.hB:
     com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> a
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexProgramClass clazz -> c
@@ -54328,7 +54084,7 @@
     43:44:void com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer.registerField(com.android.tools.r8.graph.DexField):85:86 -> a
     43:44:void registerField(com.android.tools.r8.graph.DexEncodedField):97 -> a
     1:1:void run():53:53 -> b
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry -> com.android.tools.r8.internal.nB:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry -> com.android.tools.r8.internal.gB:
     com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer this$0 -> f
     1:2:void <init>(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):121:122 -> <init>
     1:1:boolean com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry.registerField(com.android.tools.r8.graph.DexField):126:126 -> a
@@ -54356,16 +54112,16 @@
     1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):130:131 -> h
     3:3:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> h
     3:3:boolean registerMethod(com.android.tools.r8.graph.DexMethod):131 -> h
-com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.uE:
+com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.nE:
     1:1:void <init>():7:7 -> <init>
     boolean isPeepholeOptimizationsEnabled() -> a
-com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions -> com.android.tools.r8.internal.sE:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$DefaultMethodConversionOptions -> com.android.tools.r8.internal.lE:
     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.tE:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.mE:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> a
     boolean enablePeepholeOptimizations -> b
     boolean $assertionsDisabled -> c
@@ -54374,7 +54130,7 @@
     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.MethodOptimizationFeedback -> com.android.tools.r8.internal.DE:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.wE:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
@@ -54397,7 +54153,7 @@
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> d
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> e
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> f
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.NE:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.GE:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod) -> a
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation() -> a
@@ -54405,14 +54161,14 @@
     boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod) -> b
     void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod) -> c
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.conversion.MethodProcessorWithWave -> com.android.tools.r8.internal.OE:
+com.android.tools.r8.ir.conversion.MethodProcessorWithWave -> com.android.tools.r8.internal.HE:
     com.android.tools.r8.utils.collections.ProgramMethodSet waveExtension -> b
     com.android.tools.r8.utils.collections.ProgramMethodSet wave -> a
     1:4:void <init>():10:13 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():17:17 -> a
     1:1:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):22:22 -> b
     1:1:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):27:27 -> c
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.wK:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.mK:
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> c
     1:3:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.utils.collections.ProgramMethodSet):23:25 -> <init>
     1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder builder(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):29:29 -> a
@@ -54440,16 +54196,16 @@
     23:27:void forEachWaveWithExtension(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,java.util.concurrent.ExecutorService):82 -> a
     28:28:void lambda$forEachWaveWithExtension$0(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,com.android.tools.r8.graph.ProgramMethod):80:80 -> a
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android.tools.r8.internal.uK:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android.tools.r8.internal.kK:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToProcess -> a
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> b
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):91:91 -> <init>
     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.vK:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.lK:
     void accept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.internal.ZL:
+com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.internal.PL:
     java.util.Deque waves -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet processed -> e
@@ -54468,31 +54224,31 @@
     31:35:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):186 -> a
     36:38:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):187:189 -> a
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):58:59 -> d
-com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.internal.YL:
+com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.internal.OL:
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocessBuilder -> a
     1:3:void <init>(com.android.tools.r8.graph.GraphLens):66:68 -> <init>
     1:1:void add(com.android.tools.r8.graph.ProgramMethod):73:73 -> a
     2:2:void add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):77:77 -> a
-    3:3:void addAll(java.util.Collection,com.android.tools.r8.graph.GraphLens):81:81 -> a
-    4:4:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):90:90 -> a
-    5:5:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):95:95 -> a
-    6:6:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder removeAll(java.util.Collection):103:103 -> a
-    7:7:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder rewrittenWithLens(com.android.tools.r8.graph.AppView):111:111 -> a
-    8:8:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
-    8:8:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder rewrittenWithLens(com.android.tools.r8.graph.AppView):111 -> a
-    9:9:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder rewrittenWithLens(com.android.tools.r8.graph.GraphLens):116:116 -> a
-    10:30:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):123:143 -> a
-    31:31:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):128:128 -> a
-    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
-    32:32:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):128 -> a
-    33:36:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):128:131 -> a
-    37:37:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
-    37:37:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):131 -> a
+    3:3:void com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):77:77 -> a
+    3:3:void lambda$addAll$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):81 -> a
+    4:4:void addAll(java.util.Collection,com.android.tools.r8.graph.GraphLens):81:81 -> a
+    5:5:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder merge(com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder):90:90 -> a
+    6:6:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):95:95 -> a
+    7:7:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder removeAll(java.util.Collection):103:103 -> a
+    8:8:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder rewrittenWithLens(com.android.tools.r8.graph.AppView):111:111 -> a
+    9:9:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):138:138 -> a
+    9:9:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder rewrittenWithLens(com.android.tools.r8.graph.AppView):111 -> a
+    10:10:com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder rewrittenWithLens(com.android.tools.r8.graph.GraphLens):116:116 -> a
+    11:31:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):123:143 -> a
+    32:32:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):128:128 -> a
+    33:33:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
+    33:33:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):128 -> a
+    34:37:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):128:131 -> a
+    38:38:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
+    38:38:void lambda$build$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):131 -> a
     1:1:boolean contains(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):85:85 -> b
-    1:1:void com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):77:77 -> c
-    1:1:void lambda$addAll$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):81 -> c
-    1:1:void remove(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):99:99 -> d
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.internal.DM:
+    1:1:void remove(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):99:99 -> c
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.internal.tM:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> d
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> f
     com.android.tools.r8.graph.AppView appView -> c
@@ -54516,13 +54272,13 @@
     46:48:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):146:148 -> a
     boolean isPrimaryMethodProcessor() -> b
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):82:83 -> d
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.AM:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.qM:
     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$WaveDoneAction -> com.android.tools.r8.internal.BM:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction -> com.android.tools.r8.internal.rM:
     void notifyWaveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService) -> a
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.internal.CM:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.internal.sM:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.qV:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.gV:
     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
@@ -54546,10 +54302,10 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     int getMoveExceptionRegister(int) -> f
     int instructionOffset(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.VW:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.LW:
     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$IdToTargetMapping -> com.android.tools.r8.internal.PW:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.FW:
     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
@@ -54560,7 +54316,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):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.OW:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.EW:
     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
@@ -54583,7 +54339,7 @@
     66:80: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
     81:81: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
     81:81: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.RW:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.HW:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -54597,7 +54353,7 @@
     31:31:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,java.util.Set):335:335 -> a
     31:31:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331 -> a
     31:31: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.QW:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.GW:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -54628,7 +54384,7 @@
     49:49:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):238 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     50:59:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):238:247 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.TW:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.JW:
     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
@@ -54639,7 +54395,7 @@
     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.SW:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.IW:
     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
@@ -54720,11 +54476,11 @@
     28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1546:1548 -> 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.UW:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.KW:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():797:797 -> <clinit>
     1:8:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock(com.android.tools.r8.ir.code.JumpInstruction):805:812 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.internal.ZW:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.internal.PW:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement stringType -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
@@ -54739,7 +54495,7 @@
     21:22:void run(com.android.tools.r8.ir.code.IRCode):79 -> b
     23:23:void run(com.android.tools.r8.ir.code.IRCode):84:84 -> b
     24:44:void run(com.android.tools.r8.ir.code.IRCode):80:100 -> b
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.internal.WW:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.internal.MW:
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> g
     com.android.tools.r8.ir.code.BasicBlock block -> f
     com.android.tools.r8.ir.conversion.StringSwitchRemover this$0 -> i
@@ -54777,7 +54533,7 @@
     67:67:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):331 -> a
     67:67:void removeStringSwitch():255 -> a
     68:77:void removeStringSwitch():256:265 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.internal.XW:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.internal.NW:
     com.android.tools.r8.ir.code.BasicBlock idSwitchBlock -> h
     com.android.tools.r8.ir.conversion.StringSwitchRemover this$0 -> l
     boolean $assertionsDisabled -> m
@@ -54861,7 +54617,7 @@
     135:143:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):473:481 -> a
     135:143:void removeStringSwitch():386 -> a
     144:146:void removeStringSwitch():387:389 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.internal.YW:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.internal.OW:
     java.util.ListIterator blockIterator -> b
     java.util.Set newBlocksWithStrings -> c
     com.android.tools.r8.ir.code.Value stringValue -> e
@@ -54870,7 +54626,7 @@
     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.EX:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.uX:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -54881,13 +54637,13 @@
     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.DX:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.tX:
     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.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.XX:
+com.android.tools.r8.ir.conversion.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.NX:
     java.util.List instructionBuilders -> a
     com.android.tools.r8.ir.code.Position position -> b
     1:3:void <init>(java.util.List,com.android.tools.r8.ir.code.Position):21:23 -> <init>
@@ -54913,7 +54669,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():76:76 -> e
     1:1:int getMoveExceptionRegister(int):123:123 -> f
     int instructionOffset(int) -> g
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.a00:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.QZ:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -55034,7 +54790,7 @@
     184:184:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
     185:200:void com.android.tools.r8.ir.conversion.TypeConstraintResolver.link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250:265 -> a
     185:200:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
-com.android.tools.r8.ir.conversion.callgraph.CallGraph -> com.android.tools.r8.internal.n6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraph -> com.android.tools.r8.internal.m6:
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
     1:1:void <clinit>():39:39 -> <clinit>
@@ -55054,13 +54810,13 @@
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet extractRoots():76:76 -> d
     2:14:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.conversion.callgraph.CallGraph.extractNodes(java.util.function.Predicate,java.util.function.Consumer):80:92 -> d
     2:14:com.android.tools.r8.utils.collections.ProgramMethodSet extractRoots():76 -> d
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBase -> com.android.tools.r8.internal.o6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBase -> com.android.tools.r8.internal.n6:
     java.util.Map nodes -> a
     1:2:void <init>(java.util.Map):16:17 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase getNode(com.android.tools.r8.graph.ProgramMethod):25:25 -> a
     2:2:java.util.Collection getNodes():29:29 -> a
     1:1:boolean isEmpty():21:21 -> b
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilder -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilder -> com.android.tools.r8.internal.o6:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
@@ -55069,7 +54825,7 @@
     3:3:void processClass(com.android.tools.r8.graph.DexProgramClass):30:30 -> a
     4:6:boolean verifyAllMethodsWithCodeExists():46:48 -> a
     1:8:void processMethod(com.android.tools.r8.graph.ProgramMethod):34:41 -> c
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilderBase -> com.android.tools.r8.internal.q6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilderBase -> com.android.tools.r8.internal.p6:
     java.util.Map nodes -> b
     java.util.Map possibleProgramTargetsCache -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -55078,13 +54834,13 @@
     com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase lambda$getOrCreateNode$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):30:30 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase getOrCreateNode(com.android.tools.r8.graph.ProgramMethod):30:30 -> b
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation -> com.android.tools.r8.internal.u6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation -> com.android.tools.r8.internal.t6:
     1:1:void <init>():18:18 -> <init>
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation empty():33:33 -> a
     boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod) -> b
     void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.internal.s6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.internal.r6:
     java.util.Set singleCallerMethods -> a
     java.util.Set multiCallerInlineCandidates -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph):61:61 -> <init>
@@ -55094,7 +54850,7 @@
     4:4:boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod):112:112 -> a
     1:1:boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod):123:123 -> b
     1:2:void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod):128:129 -> c
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.internal.t6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.internal.s6:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation EMPTY_INFO -> a
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():36:36 -> <init>
@@ -55102,7 +54858,7 @@
     boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod) -> b
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation access$000():36:36 -> b
     void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator -> com.android.tools.r8.internal.Zd:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator -> com.android.tools.r8.internal.Yd:
     java.util.Deque writerStack -> d
     java.util.Map stackEntryInfo -> b
     java.util.Deque clinitCallStack -> c
@@ -55177,39 +54933,39 @@
     74:76:void recordCallEdgeRemoval(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):447:449 -> b
     1:1:void removeCallEdge(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):371:371 -> c
     1:1:void removeFieldReadEdge(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):375:375 -> d
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge -> com.android.tools.r8.internal.Yd:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge -> com.android.tools.r8.internal.Xd:
     com.android.tools.r8.ir.conversion.callgraph.Node callee -> b
     com.android.tools.r8.ir.conversion.callgraph.Node caller -> a
     1:3:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):35:37 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$400(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge):30:30 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$500(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge):30:30 -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult -> com.android.tools.r8.internal.Zd$a:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult -> com.android.tools.r8.internal.Yd$a:
     java.util.Map removedCallEdges -> a
     1:2:void <init>(java.util.Map):58:59 -> <init>
     1:2:int numberOfRemovedCallEdges():64:65 -> a
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem -> com.android.tools.r8.internal.ae:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem -> com.android.tools.r8.internal.Zd:
     java.util.Iterator calleesAndWriters -> b
     com.android.tools.r8.ir.conversion.callgraph.Node callerOrReader -> a
     1:3:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node,java.util.Iterator):186:188 -> <init>
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem asIterator() -> a
     1:1:java.util.Iterator access$200(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem):182:182 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$300(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem):182:182 -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem -> com.android.tools.r8.internal.be:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem -> com.android.tools.r8.internal.ae:
     com.android.tools.r8.ir.conversion.callgraph.Node node -> a
     1:2:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node):167:168 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$100(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem):164:164 -> a
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem asNode() -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo -> com.android.tools.r8.internal.ce:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo -> com.android.tools.r8.internal.be:
     com.android.tools.r8.ir.conversion.callgraph.Node predecessor -> b
     boolean processed -> c
     int index -> a
     1:3:void <init>(int,com.android.tools.r8.ir.conversion.callgraph.Node):48:50 -> <init>
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$WorkItem -> com.android.tools.r8.internal.de:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$WorkItem -> com.android.tools.r8.internal.ce:
     1:1:void <init>():146:146 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$1):146:146 -> <init>
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem asIterator() -> a
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem asNode() -> b
-com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase -> com.android.tools.r8.internal.Bn:
+com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase -> com.android.tools.r8.internal.xn:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):19:19 -> <init>
@@ -55228,7 +54984,7 @@
     28:28:void lambda$build$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):31:31 -> a
     29:29:com.android.tools.r8.ir.conversion.callgraph.Node com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase.createNode(com.android.tools.r8.graph.ProgramMethod):49:49 -> a
     29:29:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):16 -> a
-com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry -> com.android.tools.r8.internal.Cn:
+com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry -> com.android.tools.r8.internal.yn:
     com.android.tools.r8.graph.FieldAccessInfoCollection fieldAccessInfoCollection -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():25:25 -> <clinit>
@@ -55267,7 +55023,7 @@
     17:17:void processFieldRead(com.android.tools.r8.graph.DexField):78 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:20:void processFieldRead(com.android.tools.r8.graph.DexField):79:81 -> i
-com.android.tools.r8.ir.conversion.callgraph.InvokeExtractor -> com.android.tools.r8.internal.yu:
+com.android.tools.r8.ir.conversion.callgraph.InvokeExtractor -> com.android.tools.r8.internal.ru:
     java.util.function.Function nodeFactory -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.conversion.callgraph.NodeBase currentMethod -> f
@@ -55312,7 +55068,7 @@
     1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):178:178 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):183:183 -> g
-com.android.tools.r8.ir.conversion.callgraph.Node -> com.android.tools.r8.internal.nH:
+com.android.tools.r8.ir.conversion.callgraph.Node -> com.android.tools.r8.internal.dH:
     java.util.Set writers -> g
     java.util.Set callees -> d
     java.util.Set callers -> e
@@ -55363,14 +55119,14 @@
     216:216:java.lang.String toString():184:184 -> toString
     217:217:java.lang.String toString():185:185 -> toString
     187:214:java.lang.String toString():186:213 -> toString
-com.android.tools.r8.ir.conversion.callgraph.NodeBase -> com.android.tools.r8.internal.oH:
+com.android.tools.r8.ir.conversion.callgraph.NodeBase -> com.android.tools.r8.internal.eH:
     com.android.tools.r8.graph.ProgramMethod method -> b
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):14:15 -> <init>
     void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean) -> a
     void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase) -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():23:23 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getProgramMethod():27:27 -> b
-com.android.tools.r8.ir.conversion.callgraph.PartialCallGraphBuilder -> com.android.tools.r8.internal.CL:
+com.android.tools.r8.ir.conversion.callgraph.PartialCallGraphBuilder -> com.android.tools.r8.internal.sL:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> e
     1:1:void <clinit>():15:15 -> <clinit>
@@ -55379,7 +55135,7 @@
     2:2:void populateGraph(java.util.concurrent.ExecutorService):27:27 -> a
     3:4:boolean verifyAllMethodsWithCodeExists():43:44 -> a
     1:8:void processMethod(com.android.tools.r8.graph.ProgramMethod):31:38 -> c
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.l4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.k4:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods rewritableMethods -> b
     boolean $assertionsDisabled -> c
@@ -55400,21 +55156,21 @@
     92:92:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     93:102:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):129:138 -> a
-    103:103:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    103:103:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     103:103:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):138 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     104:104:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):138 -> a
     105:110:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):138:143 -> a
     1:1:boolean hasBackports():66:66 -> b
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.c4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.b4:
     1:1:void <init>():1647:1647 -> <init>
     1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1651:1651 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.d4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.c4:
     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):1527:1528 -> <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):1538:1538 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.e4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.d4:
     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):1548:1548 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1552:1553 -> <init>
@@ -55427,14 +55183,14 @@
     15:15: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):1594:1594 -> a
     15:15:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1586 -> a
     16:16:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1590:1590 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.f4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.e4:
     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):1643:1643 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.g4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.f4:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):1510:1511 -> <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.h4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.g4:
     java.util.Map rewritable -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -55472,68 +55228,68 @@
     1:19:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1429:1447 -> i
     1:8:void initializeObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):1465:1472 -> j
     1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1453:1459 -> k
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.i4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.h4:
     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):1607:1608 -> <init>
     1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1613:1613 -> a
     2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1590:1590 -> a
     2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1613 -> a
     3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1613:1613 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodWithForwardingGenerator -> com.android.tools.r8.internal.j4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodWithForwardingGenerator -> com.android.tools.r8.internal.i4:
     1:1: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):1622:1622 -> <init>
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():1627:1627 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.k4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.j4:
     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.X5:
+com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.W5:
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):28:30 -> <init>
     1:15:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):61:75 -> a
     16:18:boolean com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter.isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):83:85 -> a
     16:18: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):43 -> a
     19:29: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):46:56 -> a
-    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> a
+    30:30:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
     30:30: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):56 -> a
     31:32: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):56:57 -> a
-    33:33:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    33:33:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     33: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):57 -> a
     34:34: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):57:57 -> a
     35:37:boolean com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter.isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):83:85 -> a
     35:37:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):90 -> a
     38:39:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):93:94 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.K6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.J6:
     void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.N6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.M6:
     1:1:void <init>():17:17 -> <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):20:21 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     3:3:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):21 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     4:4:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):21 -> 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):34:34 -> a
     5:5:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):23 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     6:6:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):23 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     7:7:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):34 -> a
     7:7:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):23 -> a
     8:11:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):35:38 -> a
     8:11:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):23 -> a
     12:28:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):25:41 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.L6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.K6:
     1:1:void <init>():69:69 -> <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.M6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.L6:
     java.util.Collection synthesizers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():48:48 -> <clinit>
     1:3:void <init>(java.util.Collection):53:55 -> <init>
     1:1:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):62:62 -> a
     2:2:void lambda$synthesizeClasses$0(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):64:64 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.O6:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.N6:
     java.util.Set synthesizedClasses -> a
     1:7:void <init>():15:21 -> <init>
     1:1:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):45:45 -> a
@@ -55542,13 +55298,13 @@
     1:1:void acceptEnumConversionProgramClass(com.android.tools.r8.graph.DexProgramClass):35:35 -> c
     1:1:void acceptProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):25:25 -> d
     1:1:void acceptWrapperProgramClass(com.android.tools.r8.graph.DexProgramClass):30:30 -> e
-com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.z7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.y7:
     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.ir.desugar.CfInstructionDesugaringCollection,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.A7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.z7:
     1:1:void <init>():28:28 -> <init>
     void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
     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) -> a
@@ -55560,14 +55316,14 @@
     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,com.android.tools.r8.androidapi.AndroidApiLevelCompute):32:37 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     7:7:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):37 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     8:8:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):37 -> a
     9:11:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):38:40 -> a
     12:12:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection empty():44:44 -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.D7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.C7:
     1:1:void <init>():49:49 -> <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
@@ -55580,7 +55336,7 @@
     void com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringEventConsumer.acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> f
     void com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer.acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> g
     void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer.acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> h
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.B7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.A7:
     java.util.Map pendingInvokeSpecialBridges -> b
     java.util.List synthesizedConstantDynamicClasses -> d
     java.util.List synthesizedLambdaClasses -> c
@@ -55626,7 +55382,7 @@
     1:1:void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):178:178 -> f
     1:1:void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod):119:119 -> g
     1:1:void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):172:172 -> h
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.C7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.B7:
     java.util.function.BiConsumer onCompanionMethodCallback -> i
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.BiConsumer twrCloseResourceMethodConsumer -> d
@@ -55674,19 +55430,19 @@
     1:1:void acceptInvokeStaticInterfaceOutliningMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):342:342 -> f
     void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> g
     void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> h
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.d8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.c8:
     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.g8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.f8:
     1:1:void <init>():20:20 -> <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):24:24 -> 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):54:56 -> 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):25 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> 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):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):25 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     6:6: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):56 -> a
     6:6:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):25 -> a
     7:25: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):57:75 -> a
@@ -55698,17 +55454,17 @@
     27:27:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):25 -> a
     28:28:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection.empty():32:32 -> a
     28:28:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):28 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.e8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.d8:
     com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>():100:100 -> <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():94:94 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.f8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.e8:
     java.util.List desugarings -> a
     1:2:void <init>(java.util.List):48:49 -> <init>
     1:2:void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):88:89 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.j8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.i8:
     1:1:void <init>():26:26 -> <init>
     void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer.acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod) -> a
     void com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer.acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass) -> a
@@ -55717,7 +55473,7 @@
     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.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.h8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.g8:
     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
@@ -55737,7 +55493,7 @@
     1:3:void com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer.addMethodToReprocess(com.android.tools.r8.graph.ProgramMethod):62:64 -> b
     1:3:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):91 -> b
     void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> c
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.i8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.h8:
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> b
     java.util.function.BiConsumer missingClassConsumer -> c
     com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions additions -> a
@@ -55752,7 +55508,7 @@
     1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):164:164 -> b
     2:2:void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass):175:175 -> b
     1:1:void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass):180:180 -> c
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.Vd:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.Ud:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     boolean $assertionsDisabled -> c
@@ -55841,7 +55597,7 @@
     22:22:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):99 -> b
     23:27:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):98:102 -> b
     28:28:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):99:99 -> b
-com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.wf:
+com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.rf:
     com.android.tools.r8.ir.desugar.DesugarDescription NOTHING -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugarDescription$1):23:23 -> <init>
@@ -55852,21 +55608,21 @@
     boolean needsDesugaring() -> c
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription nothing():47:47 -> d
     void scan() -> e
-com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.qf:
+com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.lf:
     1:1:void <init>():70:70 -> <init>
     com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback) -> a
     com.android.tools.r8.ir.desugar.DesugarDescription build() -> a
     com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback) -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.rf:
+com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.mf:
     java.util.Collection desugarInstruction(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
-com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.sf:
+com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.nf:
     com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder INSTANCE -> a
     1:1:void <clinit>():83:83 -> <clinit>
     1:1:void <init>():82:82 -> <init>
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription build():91:91 -> a
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):96:96 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):101:101 -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.uf:
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.pf:
     java.util.List scanEffects -> a
     com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback desugarRewrite -> b
     boolean $assertionsDisabled -> c
@@ -55875,15 +55631,15 @@
     1:2:com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):112:113 -> a
     3:5:com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):119:121 -> a
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription build():127:127 -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.tf:
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.of:
     com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder):127:127 -> <init>
     1:3:java.util.Collection desugarInstruction(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):146:148 -> a
     1:1:boolean needsDesugaring():135:135 -> c
     1:1:void scan():130:130 -> e
-com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.vf:
+com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.qf:
     void scan() -> a
-com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.Nh:
+com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.Ih:
     com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():25:25 -> <init>
@@ -55897,9 +55653,9 @@
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection getInstance():29:29 -> b
-com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.dl:
+com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.Yk:
     int getFreshLocal(int) -> a
-com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.Mu:
+com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.Fu:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():28:28 -> <init>
@@ -55911,7 +55667,7 @@
     18:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter.privateMethodInvokedOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):61:67 -> a
     18:24:boolean com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter.isInvokingPrivateMethodOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):74 -> a
     18:24:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):57 -> a
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.FA:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.yA:
     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
@@ -55973,17 +55729,17 @@
     89:99:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):45:55 -> a
     89:99:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):208 -> a
     89:99:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):135 -> a
-    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     100:100:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):55 -> a
     100:100:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):208 -> a
     100:100:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):135 -> a
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     101:101:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):55 -> a
     101:101:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):208 -> a
     101:101:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):135 -> a
-    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     102:102:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode.build(com.android.tools.r8.ir.desugar.LambdaClass):55 -> a
     102:102:void com.android.tools.r8.ir.desugar.LambdaClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):208 -> a
     102:102:void synthesizeLambdaClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):135 -> a
@@ -56018,7 +55774,7 @@
     211:216:com.android.tools.r8.graph.DexField getCaptureField(int):140:145 -> a
     217:217:com.android.tools.r8.graph.DexField getCaptureField(int):142:142 -> a
     218:219:boolean canAccessModifyLambdaImplMethod():326:327 -> a
-    220:220:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1800:1800 -> a
+    220:220:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1788:1788 -> a
     220:220:boolean canAccessModifyLambdaImplMethod():327 -> a
     221:224:boolean com.android.tools.r8.ir.desugar.LambdaClass.isPrivateOrStaticInterfaceMethodInvokeThatWillBeDesugared():319:322 -> a
     221:224:boolean canAccessModifyLambdaImplMethod():328 -> a
@@ -56179,7 +55935,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():199:199 -> d
     3:3:boolean isStateless():149 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.xA:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.qA:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> h
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
@@ -56196,81 +55952,81 @@
     54:77:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):28:51 -> a
     54:77:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):812 -> a
     78:85:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):811:818 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     86:86:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):818 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    87:87:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     87:87:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):818 -> a
     88:90:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):818:820 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.yA:
+com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.rA:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):559:559 -> <init>
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.zA:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.sA:
     com.android.tools.r8.graph.DexMethod implMethod -> f
     com.android.tools.r8.graph.AppView appView -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():696:696 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):703:705 -> <init>
     1:33:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):715:747 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     34:34:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):747 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     35:35:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):747 -> a
     36:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):747:750 -> a
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     40:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):750 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     41:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):750 -> a
     42:42:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751:751 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     43:43:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    44:44:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    44:44:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     44:44:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751 -> a
     45:54:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751:760 -> a
     55:73:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):723:741 -> a
     74:74:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):740:740 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.tA:
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.DexMethod implMethod -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():604:604 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):611:613 -> <init>
     1:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):622:659 -> a
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     39:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     40:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659 -> a
     41:44:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659:662 -> a
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    45:45:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     45:45:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):662 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     46:46:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):662 -> a
     47:47:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:663 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     48:48:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:49:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    49:49:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     49:49:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663 -> a
     50:59:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:672 -> a
     60:78:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):632:650 -> a
     79:83:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):649:653 -> a
     84:84: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$InvalidLambdaImplTarget -> com.android.tools.r8.internal.BA:
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.uA:
     com.android.tools.r8.graph.DexType exceptionType -> f
     1:685:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType,boolean):0:684 -> <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.CA:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.vA:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):567:567 -> <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.DA:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.wA:
     com.android.tools.r8.graph.ProgramMethod target -> f
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod,boolean):584:585 -> <init>
     1:4:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):593:596 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.EA:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.xA:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod callTarget -> a
@@ -56280,10 +56036,10 @@
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):525:530 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
     1:3:void ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):546:548 -> b
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.GA:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.zA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.HA:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.AA:
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> j
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
@@ -56345,11 +56101,11 @@
     274:318:boolean needsAccessor(com.android.tools.r8.graph.ProgramMethod):213:257 -> a
     319:322:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):281:284 -> a
     319:322:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):293 -> a
-    323:323:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> a
+    323:323:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> a
     323:323:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):284 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     323:323:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):293 -> a
-    324:324:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> a
+    324:324:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> a
     324:324:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):284 -> a
     324:324:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):293 -> a
     325:349:com.android.tools.r8.ir.desugar.LambdaDescriptor infer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):294:318 -> a
@@ -56397,7 +56153,7 @@
     2005:2008:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):460:463 -> a
     1:1:com.android.tools.r8.graph.DexMethod getMainMethod():67:67 -> 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):266:267 -> b
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.MA:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.FA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():44:44 -> <clinit>
     1:15:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):97:111 -> a
@@ -56420,7 +56176,7 @@
     30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):85:85 -> a
     30:30:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):115 -> a
     31:43:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116:128 -> a
-    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):779:779 -> a
+    44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):777:777 -> a
     44:44:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):135 -> a
     45:54:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):136:145 -> a
     60:60:boolean isSameOrAdaptableTo(byte,byte):170:170 -> a
@@ -56435,15 +56191,15 @@
     237:241:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):176:180 -> a
     242:256:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.buildThrowingCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):312:326 -> a
     242:256:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):181 -> a
-    257:257:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    257:257:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     257:257:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.buildThrowingCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):326 -> a
     257:257:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):181 -> a
-    258:258:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    258:258:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    258:258:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    258:258:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     258:258:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.buildThrowingCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):326 -> a
     258:258:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):181 -> a
-    259:259:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    259:259:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    259:259:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    259:259:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     259:259:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.buildThrowingCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):326 -> a
     259:259:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):181 -> a
     260:292:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):184:216 -> a
@@ -56456,7 +56212,7 @@
     341:342:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.enforceParameterType(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):376:377 -> a
     341:342: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):363 -> a
     341:342:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):248 -> a
-    343:343:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    343:343:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     343:343:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.enforceParameterType(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):377 -> a
     343:343: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):363 -> a
     343:343:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):248 -> a
@@ -56478,13 +56234,13 @@
     406:407:int com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.prepareReturnValue(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):346:347 -> a
     406:407:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):288 -> a
     408:426:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):286:304 -> a
-    427:427:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    427:427:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     427:427:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):304 -> a
-    428:428:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    428:428:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    428:428:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    428:428:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     428:428:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):304 -> a
-    429:429:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    429:429:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    429:429:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    429:429:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     429:429:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke):304 -> a
     430:444:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):412:426 -> a
     430:444:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
@@ -56516,15 +56272,15 @@
     459:459:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     460:460:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430:430 -> a
     460:460:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    461:461:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    461:461:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     461:461:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430 -> a
     461:461:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     462:462:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):430:430 -> a
     462:462:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    463:463:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):779:779 -> a
+    463:463:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):777:777 -> a
     463:463:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):432 -> a
     463:463:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    464:465:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):754:755 -> a
+    464:465:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):752:753 -> a
     464:465:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     464:465:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     464:465:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
@@ -56533,33 +56289,33 @@
     466:466:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     467:467:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):435:435 -> a
     467:467:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    468:468:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    468:468:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     468:468:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     468:468:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     468:468:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     469:469:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":530,"2":531,"3":532,"4":533,"5":534}}
-    530:530:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    530:530:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     530:530:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     530:530:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     530:530:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    531:531:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    531:531:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     531:531:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     531:531:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     531:531:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    532:532:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    532:532:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     532:532:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     532:532:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     532:532:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    533:533:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    533:533:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     533:533:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     533:533:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     533:533:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    534:534:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    534:534:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     534:534:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     534:534:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     534:534:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    470:470:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    470:470:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     470:470:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     470:470:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):434 -> a
     470:470:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
@@ -56591,61 +56347,61 @@
     485:485:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     486:486:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):444:444 -> a
     486:486:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    487:487:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):764:764 -> a
+    487:487:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):762:762 -> a
     487:487:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     487:487:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     487:487:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    488:488:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):779:779 -> a
-    488:488:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765 -> a
+    488:488:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):777:777 -> a
+    488:488:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763 -> a
     488:488:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     488:488:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     488:488:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    489:490:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):769:770 -> a
+    489:490:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:768 -> a
     489:490:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     489:490:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     489:490:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     491:491:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):553:553 -> a
     491:491:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     491:491:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    492:492:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    492:492:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     492:492:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     492:492:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     492:492:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     493:493:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":540,"2":541,"3":542,"4":543,"5":544}}
-    540:540:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    540:540:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     540:540:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     540:540:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     540:540:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    541:541:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    541:541:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     541:541:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     541:541:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     541:541:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    542:542:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    542:542:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     542:542:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     542:542:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     542:542:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    543:543:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    543:543:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     543:543:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     543:543:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     543:543:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    544:544:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    544:544:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     544:544:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     544:544:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     544:544:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    494:494:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    494:494:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     494:494:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     494:494:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):451 -> a
     494:494:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     495:509:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):456:470 -> a
     495:509:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
-    510:510:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    510:510:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     510:510:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):470 -> a
     510:510:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     511:511:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):470:470 -> a
     511:511:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):387 -> a
     512:512:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):389:389 -> a
-    513:513:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):779:779 -> a
+    513:513:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):777:777 -> a
     513:513:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):392 -> a
     514:519:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):394:399 -> a
     520:520:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):395:395 -> a
@@ -56684,12 +56440,12 @@
     1196:1196:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
     1197:1197:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
     1187:1187:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.LA:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.EA:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():492:492 -> <clinit>
-com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.nC:
     void allocateLocalStack(int) -> a
-com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.rH:
+com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.hH:
     java.util.List desugarings -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> f
@@ -56702,10 +56458,10 @@
     2:47:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):51:96 -> <init>
     48:93:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):95:140 -> <init>
     1:2:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):145:146 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     3:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):146 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     4:4:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):146 -> a
     5:6:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):146:147 -> a
     7:7:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.noAndroidApiLevelCompute():54:54 -> a
@@ -56758,28 +56514,28 @@
     192:192:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):342 -> a
     193:193:boolean needsDesugaring(com.android.tools.r8.graph.ProgramMethod):339:339 -> a
     194:194:boolean lambda$needsDesugaring$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfInstruction):343:343 -> a
-    195:195:boolean lambda$needsDesugaring$7(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):348:348 -> a
-    196:196:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,java.util.Iterator,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):358:358 -> a
-    197:213:void lambda$verifyNoOtherDesugaringNeeded$9(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):360:376 -> a
-    214:216:void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer):384:386 -> a
-    217:218:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):393:394 -> a
-    219:220: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):401:402 -> a
-    221:222:void withDesugaredLibraryAPIConverter(java.util.function.Consumer):408:409 -> a
+    195:195:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):347:347 -> a
+    196:196:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    196:196:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):347 -> a
+    197:197:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):347:347 -> a
+    198:198:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    198:198:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):349 -> a
+    199:199:boolean lambda$needsDesugaring$7(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):348:348 -> a
+    200:200:boolean verifyNoOtherDesugaringNeeded(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,java.util.Iterator,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):358:358 -> a
+    201:217:void lambda$verifyNoOtherDesugaringNeeded$9(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):360:376 -> a
+    218:220:void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer):384:386 -> a
+    221:222:com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade getInterfaceMethodPostProcessingDesugaringD8(com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):393:394 -> a
+    223:224: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):401:402 -> a
+    225:226:void withDesugaredLibraryAPIConverter(java.util.function.Consumer):408:409 -> a
     1:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):156:158 -> b
     4:4:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.noAndroidApiLevelCompute():54:54 -> b
     4:4:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):159 -> b
     5:7:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToDexNonDesugar(com.android.tools.r8.graph.AppView):159:161 -> b
     8:25:boolean noDesugaringBecauseOfImpreciseDesugaring(com.android.tools.r8.graph.ProgramMethod):244:261 -> b
     26:26:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$4(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):251:251 -> b
-    27:27:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):347:347 -> b
-    28:28:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> b
-    28:28:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):347 -> b
-    29:29:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):347:347 -> b
-    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):608:608 -> b
-    30:30:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):349 -> b
-    31:31:boolean lambda$needsDesugaring$8(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):350:350 -> b
+    27:27:boolean lambda$needsDesugaring$8(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):350:350 -> b
     1:1:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$5(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):257:257 -> c
-com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.JM:
+com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.zM:
     java.util.Map additions -> b
     java.util.Set added -> a
     boolean $assertionsDisabled -> c
@@ -56790,7 +56546,7 @@
     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.TypeRewriter -> com.android.tools.r8.internal.i00:
+com.android.tools.r8.ir.desugar.TypeRewriter -> com.android.tools.r8.internal.YZ:
     1:1:void <init>():15:15 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
@@ -56799,14 +56555,14 @@
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):28:28 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):32:36 -> 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.TypeRewriter$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.g00:
+com.android.tools.r8.ir.desugar.TypeRewriter$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.WZ:
     1:1:void <init>():102:102 -> <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
     com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.TypeRewriter$MachineDesugarPrefixRewritingMapper -> com.android.tools.r8.internal.h00:
+com.android.tools.r8.ir.desugar.TypeRewriter$MachineDesugarPrefixRewritingMapper -> com.android.tools.r8.internal.XZ:
     java.util.Map rewriteType -> a
     java.util.Map rewriteDerivedTypeOnly -> b
     boolean $assertionsDisabled -> c
@@ -56848,10 +56604,10 @@
     61:63:boolean com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.verifyLibraryHolderAndInvoke(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,boolean):193:195 -> a
     61:63:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):154 -> a
     64:65:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):154:155 -> a
-    66:66:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2644:2644 -> a
-    66:66:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2648 -> a
+    66:66:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2642:2642 -> a
+    66:66:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2646 -> a
     66:66:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):155 -> a
-    67:67:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2648:2648 -> a
+    67:67:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2646:2646 -> a
     67:67:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):155 -> a
     68:70:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):156:158 -> a
     71:73:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):164:166 -> a
@@ -56860,7 +56616,7 @@
     75:79:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):167:171 -> a
     80:89:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):165:174 -> a
     90:98:com.android.tools.r8.graph.Code lambda$ensureOutlineMethod$0(boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):177:185 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.m4:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.l4:
     1:23:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2291:2313 -> A
     24:24:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> A
     24:24:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2313 -> A
@@ -56872,13 +56628,13 @@
     52:52:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337 -> A
     53:56:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2337:2340 -> A
     57:101:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2300:2344 -> A
-    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> A
+    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> A
     102:102:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2344 -> A
-    103:103:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> A
-    103:103:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> A
+    103:103:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> A
+    103:103:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> A
     103:103:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2344 -> A
-    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> A
-    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> A
+    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> A
+    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> A
     104:104:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2344 -> A
     1:25:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6827:6851 -> A0
     26:39:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6847:6860 -> A0
@@ -56892,18 +56648,18 @@
     65:65:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6881 -> A0
     66:69:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6881:6884 -> A0
     70:122:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6836:6888 -> A0
-    123:123:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> A0
+    123:123:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> A0
     123:123:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6888 -> A0
-    124:124:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> A0
-    124:124:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> A0
+    124:124:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> A0
+    124:124:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> A0
     124:124:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6888 -> A0
-    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> A0
-    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> A0
+    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> A0
+    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> A0
     125:125:com.android.tools.r8.graph.CfCode ObjectsMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6888 -> A0
     1:31:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2348:2378 -> B
     32:32:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2372:2372 -> B
     33:60:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2356:2383 -> B
-    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> B
+    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> B
     61:61:com.android.tools.r8.graph.CfCode IntegerMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2383 -> B
     1:19:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6892:6910 -> B0
     20:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> B0
@@ -56914,16 +56670,16 @@
     40:40:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6924 -> B0
     41:43:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6924:6926 -> B0
     44:74:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6900:6930 -> B0
-    75:75:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> B0
+    75:75:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> B0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6930 -> B0
-    76:76:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> B0
-    76:76:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> B0
+    76:76:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> B0
+    76:76:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> B0
     76:76:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6930 -> B0
-    77:77:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> B0
-    77:77:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> B0
+    77:77:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> B0
+    77:77:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> B0
     77:77:com.android.tools.r8.graph.CfCode ObjectsMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6930 -> B0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2387:2416 -> C
-    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> C
+    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> C
     31:31:com.android.tools.r8.graph.CfCode IntegerMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2416 -> C
     1:19:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6934:6952 -> C0
     20:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> C0
@@ -56933,20 +56689,20 @@
     29:29:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6959 -> C0
     30:32:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6959:6961 -> C0
     33:56:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6942:6965 -> C0
-    57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> C0
+    57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> C0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6965 -> C0
-    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> C0
-    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> C0
+    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> C0
+    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> C0
     58:58:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6965 -> C0
-    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> C0
-    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> C0
+    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> C0
+    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> C0
     59:59:com.android.tools.r8.graph.CfCode ObjectsMethods_isNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6965 -> C0
     1:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2421:2440 -> D
     21:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2434:2447 -> D
     35:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2444:2458 -> D
     50:50:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2452:2452 -> D
     51:87:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2427:2463 -> D
-    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> D
+    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> D
     88:88:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2463 -> D
     1:19:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6969:6987 -> D0
     20:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> D0
@@ -56956,13 +56712,13 @@
     29:29:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6994 -> D0
     30:32:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6994:6996 -> D0
     33:56:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6977:7000 -> D0
-    57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> D0
+    57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> D0
     57:57:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7000 -> D0
-    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> D0
-    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> D0
+    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> D0
+    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> D0
     58:58:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7000 -> D0
-    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> D0
-    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> D0
+    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> D0
+    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> D0
     59:59:com.android.tools.r8.graph.CfCode ObjectsMethods_nonNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7000 -> D0
     1:27:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2468:2494 -> E
     28:47:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2490:2509 -> E
@@ -56975,13 +56731,13 @@
     114:128:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2551:2565 -> E
     129:129:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2559:2559 -> E
     130:222:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2478:2570 -> E
-    223:223:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> E
+    223:223:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> E
     223:223:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> E
-    224:224:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> E
-    224:224:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> E
+    224:224:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> E
+    224:224:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> E
     224:224:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> E
-    225:225:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> E
-    225:225:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> E
+    225:225:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> E
+    225:225:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> E
     225:225:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2570 -> E
     1:20:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7005:7024 -> E0
     21:21:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> E0
@@ -56989,18 +56745,18 @@
     22:35:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7024:7037 -> E0
     36:36:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7031:7031 -> E0
     37:67:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7012:7042 -> E0
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> E0
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> E0
     68:68:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7042 -> E0
-    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> E0
-    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> E0
+    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> E0
+    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> E0
     69:69:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7042 -> E0
-    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> E0
-    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> E0
+    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> E0
+    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> E0
     70:70:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7042 -> E0
     1:19:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2574:2592 -> F
     20:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2586:2586 -> F
     21:38:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2580:2597 -> F
-    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> F
+    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> F
     39:39:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2597 -> F
     1:22:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7047:7068 -> F0
     23:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7067:7067 -> F0
@@ -57008,26 +56764,26 @@
     24:24:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7067 -> F0
     25:39:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7067:7081 -> F0
     40:48:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7075:7083 -> F0
-    49:49:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> F0
+    49:49:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> F0
     49:49:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7083 -> F0
     50:56:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7083:7089 -> F0
     57:74:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7086:7103 -> F0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7097:7097 -> F0
     76:129:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7055:7108 -> F0
-    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> F0
+    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> F0
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7108 -> F0
-    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> F0
-    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> F0
+    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> F0
+    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> F0
     131:131:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7108 -> F0
-    132:132:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> F0
-    132:132:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> F0
+    132:132:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> F0
+    132:132:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> F0
     132:132:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullElseGet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7108 -> F0
     1:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2602:2621 -> G
     21:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2615:2628 -> G
     35:49:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2625:2639 -> G
     50:50:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2633:2633 -> G
     51:87:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2608:2644 -> G
-    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> G
+    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> G
     88:88:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2644 -> G
     1:23:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7113:7135 -> G0
     24:37:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7131:7144 -> G0
@@ -57035,13 +56791,13 @@
     38:38:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7144 -> G0
     39:41:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7144:7146 -> G0
     42:72:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7121:7151 -> G0
-    73:73:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> G0
+    73:73:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> G0
     73:73:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7151 -> G0
-    74:74:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> G0
-    74:74:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> G0
+    74:74:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> G0
+    74:74:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> G0
     74:74:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7151 -> G0
-    75:75:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> G0
-    75:75:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> G0
+    75:75:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> G0
+    75:75:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> G0
     75:75:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7151 -> G0
     1:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2649:2668 -> H
     21:36:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2665:2680 -> H
@@ -57063,17 +56819,17 @@
     220:220:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2806 -> H
     221:223:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2806:2808 -> H
     224:378:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2660:2814 -> H
-    379:379:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> H
+    379:379:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> H
     379:379:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2814 -> H
-    380:380:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> H
-    380:380:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> H
+    380:380:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> H
+    380:380:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> H
     380:380:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2814 -> H
-    381:381:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> H
-    381:381:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> H
+    381:381:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> H
+    381:381:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> H
     381:381:com.android.tools.r8.graph.CfCode IntegerMethods_parseUnsignedIntWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2814 -> H
     1:25:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7156:7180 -> H0
     26:26:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7177:7177 -> H0
-    27:27:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> H0
+    27:27:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> H0
     27:27:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7177 -> H0
     28:42:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7177:7191 -> H0
     43:43:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7190:7190 -> H0
@@ -57090,24 +56846,24 @@
     93:93:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7226 -> H0
     94:97:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7226:7229 -> H0
     98:165:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7167:7234 -> H0
-    166:166:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> H0
+    166:166:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> H0
     166:166:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7234 -> H0
-    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> H0
-    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> H0
+    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> H0
+    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> H0
     167:167:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7234 -> H0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> H0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> H0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> H0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> H0
     168:168:com.android.tools.r8.graph.CfCode ObjectsMethods_requireNonNullSupplier(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7234 -> H0
     1:30:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2818:2847 -> I
-    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> I
+    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> I
     31:31:com.android.tools.r8.graph.CfCode IntegerMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2847 -> I
     1:19:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7238:7256 -> I0
     20:20:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7250:7250 -> I0
     21:38:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7244:7261 -> I0
-    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> I0
+    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> I0
     39:39:com.android.tools.r8.graph.CfCode ObjectsMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7261 -> I0
     1:16:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2851:2866 -> J
-    17:17:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> J
+    17:17:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> J
     17:17:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2866 -> J
     1:21:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7265:7285 -> J0
     22:22:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> J0
@@ -57118,18 +56874,18 @@
     45:45:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7302 -> J0
     46:49:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7302:7305 -> J0
     50:86:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7273:7309 -> J0
-    87:87:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> J0
+    87:87:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> J0
     87:87:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7309 -> J0
-    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> J0
-    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> J0
+    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> J0
+    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> J0
     88:88:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7309 -> J0
-    89:89:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> J0
-    89:89:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> J0
+    89:89:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> J0
+    89:89:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> J0
     89:89:com.android.tools.r8.graph.CfCode ObjectsMethods_toStringDefault(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7309 -> J0
     1:19:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2870:2888 -> K
     20:20:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2882:2882 -> K
     21:38:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2876:2893 -> K
-    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> K
+    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> K
     39:39:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2893 -> K
     1:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7313:7330 -> K0
     19:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7327:7341 -> K0
@@ -57145,18 +56901,18 @@
     91:91:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7379 -> K0
     92:94:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7379:7381 -> K0
     95:158:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7322:7385 -> K0
-    159:159:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> K0
+    159:159:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> K0
     159:159:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7385 -> K0
-    160:160:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> K0
-    160:160:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> K0
+    160:160:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> K0
+    160:160:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> K0
     160:160:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7385 -> K0
-    161:161:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> K0
-    161:161:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> K0
+    161:161:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> K0
+    161:161:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> K0
     161:161:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElse(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7385 -> K0
     1:26:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2898:2923 -> L
     27:27:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2917:2917 -> L
     28:51:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2905:2928 -> L
-    52:52:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> L
+    52:52:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> L
     52:52:com.android.tools.r8.graph.CfCode IntegerMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2928 -> L
     1:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7390:7407 -> L0
     19:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7404:7418 -> L0
@@ -57174,18 +56930,18 @@
     97:97:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7458 -> L0
     98:100:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7458:7460 -> L0
     101:166:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7399:7464 -> L0
-    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> L0
+    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> L0
     167:167:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7464 -> L0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> L0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> L0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> L0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> L0
     168:168:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7464 -> L0
-    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> L0
-    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> L0
+    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> L0
+    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> L0
     169:169:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7464 -> L0
     1:31:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2932:2962 -> M
     32:32:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2956:2956 -> M
     33:60:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2940:2967 -> M
-    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> M
+    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> M
     61:61:com.android.tools.r8.graph.CfCode LongMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2967 -> M
     1:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7469:7486 -> M0
     19:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7483:7497 -> M0
@@ -57203,13 +56959,13 @@
     97:97:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7537 -> M0
     98:100:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7537:7539 -> M0
     101:166:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7478:7543 -> M0
-    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> M0
+    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> M0
     167:167:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7543 -> M0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> M0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> M0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> M0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> M0
     168:168:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7543 -> M0
-    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> M0
-    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> M0
+    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> M0
+    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> M0
     169:169:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7543 -> M0
     1:53:com.android.tools.r8.graph.CfCode LongMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2971:3023 -> N
     54:54:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> N
@@ -57229,13 +56985,13 @@
     153:158:com.android.tools.r8.graph.CfCode LongMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3113:3118 -> N
     159:159:com.android.tools.r8.graph.CfCode LongMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3116:3116 -> N
     160:293:com.android.tools.r8.graph.CfCode LongMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2991:3124 -> N
-    294:294:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> N
+    294:294:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> N
     294:294:com.android.tools.r8.graph.CfCode LongMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3124 -> N
-    295:295:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> N
-    295:295:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> N
+    295:295:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> N
+    295:295:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> N
     295:295:com.android.tools.r8.graph.CfCode LongMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3124 -> N
-    296:296:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> N
-    296:296:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> N
+    296:296:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> N
+    296:296:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> N
     296:296:com.android.tools.r8.graph.CfCode LongMethods_divideUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3124 -> N
     1:18:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7548:7565 -> N0
     19:33:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7562:7576 -> N0
@@ -57253,16 +57009,16 @@
     97:97:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7616 -> N0
     98:100:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7616:7618 -> N0
     101:166:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7557:7622 -> N0
-    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> N0
+    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> N0
     167:167:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7622 -> N0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> N0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> N0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> N0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> N0
     168:168:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7622 -> N0
-    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> N0
-    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> N0
+    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> N0
+    169:169:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> N0
     169:169:com.android.tools.r8.graph.CfCode OptionalMethods_ifPresentOrElseLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7622 -> N0
     1:18:com.android.tools.r8.graph.CfCode LongMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3128:3145 -> O
-    19:19:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> O
+    19:19:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> O
     19:19:com.android.tools.r8.graph.CfCode LongMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3145 -> O
     1:17:com.android.tools.r8.graph.CfCode OptionalMethods_isEmpty(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7626:7642 -> O0
     18:31:com.android.tools.r8.graph.CfCode OptionalMethods_isEmpty(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7639:7652 -> O0
@@ -57273,20 +57029,20 @@
     43:43:com.android.tools.r8.graph.CfCode OptionalMethods_isEmpty(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7661 -> O0
     44:47:com.android.tools.r8.graph.CfCode OptionalMethods_isEmpty(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7661:7664 -> O0
     48:82:com.android.tools.r8.graph.CfCode OptionalMethods_isEmpty(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7634:7668 -> O0
-    83:83:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> O0
+    83:83:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> O0
     83:83:com.android.tools.r8.graph.CfCode OptionalMethods_isEmpty(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7668 -> O0
-    84:84:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> O0
-    84:84:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> O0
+    84:84:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> O0
+    84:84:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> O0
     84:84:com.android.tools.r8.graph.CfCode OptionalMethods_isEmpty(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7668 -> O0
-    85:85:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> O0
-    85:85:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> O0
+    85:85:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> O0
+    85:85:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> O0
     85:85:com.android.tools.r8.graph.CfCode OptionalMethods_isEmpty(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7668 -> O0
     1:20:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3150:3169 -> P
     21:34:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3163:3176 -> P
     35:49:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3173:3187 -> P
     50:50:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3181:3181 -> P
     51:87:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3156:3192 -> P
-    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> P
+    88:88:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> P
     88:88:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3192 -> P
     1:17:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7672:7688 -> P0
     18:32:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7685:7699 -> P0
@@ -57299,13 +57055,13 @@
     48:48:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7708 -> P0
     49:53:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7708:7712 -> P0
     54:90:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7680:7716 -> P0
-    91:91:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> P0
+    91:91:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> P0
     91:91:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7716 -> P0
-    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> P0
-    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> P0
+    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> P0
+    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> P0
     92:92:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7716 -> P0
-    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> P0
-    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> P0
+    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> P0
+    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> P0
     93:93:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7716 -> P0
     1:27:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3197:3223 -> Q
     28:47:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3219:3238 -> Q
@@ -57318,13 +57074,13 @@
     114:128:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3280:3294 -> Q
     129:129:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3288:3288 -> Q
     130:222:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3207:3299 -> Q
-    223:223:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> Q
+    223:223:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> Q
     223:223:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3299 -> Q
-    224:224:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> Q
-    224:224:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> Q
+    224:224:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> Q
+    224:224:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> Q
     224:224:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3299 -> Q
-    225:225:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> Q
-    225:225:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> Q
+    225:225:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> Q
+    225:225:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> Q
     225:225:com.android.tools.r8.graph.CfCode LongMethods_parseLongSubsequenceWithRadixDalvik(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3299 -> Q
     1:17:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7720:7736 -> Q0
     18:32:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7733:7747 -> Q0
@@ -57337,18 +57093,18 @@
     48:48:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7756 -> Q0
     49:53:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7756:7760 -> Q0
     54:90:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7728:7764 -> Q0
-    91:91:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> Q0
+    91:91:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> Q0
     91:91:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7764 -> Q0
-    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> Q0
-    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> Q0
+    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> Q0
+    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> Q0
     92:92:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7764 -> Q0
-    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> Q0
-    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> Q0
+    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> Q0
+    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> Q0
     93:93:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7764 -> Q0
     1:19:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3303:3321 -> R
     20:20:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3315:3315 -> R
     21:38:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3309:3326 -> R
-    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> R
+    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> R
     39:39:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3326 -> R
     1:17:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7768:7784 -> R0
     18:32:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7781:7795 -> R0
@@ -57361,13 +57117,13 @@
     48:48:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7804 -> R0
     49:53:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7804:7808 -> R0
     54:90:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7776:7812 -> R0
-    91:91:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> R0
+    91:91:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> R0
     91:91:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7812 -> R0
-    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> R0
-    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> R0
+    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> R0
+    92:92:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> R0
     92:92:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7812 -> R0
-    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> R0
-    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> R0
+    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> R0
+    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> R0
     93:93:com.android.tools.r8.graph.CfCode OptionalMethods_isEmptyLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7812 -> R0
     1:46:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3331:3376 -> S
     47:94:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3372:3419 -> S
@@ -57393,27 +57149,27 @@
     54:54:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7857 -> S0
     55:65:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7857:7867 -> S0
     66:71:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7864:7869 -> S0
-    72:72:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> S0
+    72:72:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> S0
     72:72:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7869 -> S0
     73:83:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7869:7879 -> S0
     84:90:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7875:7881 -> S0
-    91:91:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> S0
+    91:91:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> S0
     91:91:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7881 -> S0
     92:92:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7881:7881 -> S0
     93:152:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7826:7885 -> S0
-    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> S0
+    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> S0
     153:153:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7885 -> S0
-    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> S0
-    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> S0
+    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> S0
+    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> S0
     154:154:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7885 -> S0
-    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> S0
-    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> S0
+    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> S0
+    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> S0
     155:155:com.android.tools.r8.graph.CfCode OptionalMethods_or(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7885 -> S0
     1:17:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3728:3744 -> T
     18:34:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3741:3757 -> T
     35:35:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3749:3749 -> T
     36:64:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3734:3762 -> T
-    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> T
+    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> T
     65:65:com.android.tools.r8.graph.CfCode LongMethods_parseUnsignedLongWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3762 -> T
     1:17:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7889:7905 -> T0
     18:31:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7902:7915 -> T0
@@ -57426,13 +57182,13 @@
     71:73:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7939:7941 -> T0
     74:74:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7937:7937 -> T0
     75:124:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7897:7946 -> T0
-    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> T0
+    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> T0
     125:125:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7946 -> T0
-    126:126:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> T0
-    126:126:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> T0
+    126:126:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> T0
+    126:126:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> T0
     126:126:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7946 -> T0
-    127:127:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> T0
-    127:127:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> T0
+    127:127:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> T0
+    127:127:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> T0
     127:127:com.android.tools.r8.graph.CfCode OptionalMethods_stream(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7946 -> T0
     1:53:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3766:3818 -> U
     54:54:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> U
@@ -57452,13 +57208,13 @@
     155:160:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3910:3915 -> U
     161:161:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3913:3913 -> U
     162:296:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3786:3920 -> U
-    297:297:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> U
+    297:297:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> U
     297:297:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920 -> U
-    298:298:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> U
-    298:298:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> U
+    298:298:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> U
+    298:298:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> U
     298:298:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920 -> U
-    299:299:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> U
-    299:299:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> U
+    299:299:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> U
+    299:299:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> U
     299:299:com.android.tools.r8.graph.CfCode LongMethods_remainderUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3920 -> U
     1:17:com.android.tools.r8.graph.CfCode OptionalMethods_streamDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7950:7966 -> U0
     18:31:com.android.tools.r8.graph.CfCode OptionalMethods_streamDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7963:7976 -> U0
@@ -57472,18 +57228,18 @@
     74:76:com.android.tools.r8.graph.CfCode OptionalMethods_streamDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8001:8003 -> U0
     77:77:com.android.tools.r8.graph.CfCode OptionalMethods_streamDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7999:7999 -> U0
     78:128:com.android.tools.r8.graph.CfCode OptionalMethods_streamDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):7958:8008 -> U0
-    129:129:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> U0
+    129:129:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> U0
     129:129:com.android.tools.r8.graph.CfCode OptionalMethods_streamDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8008 -> U0
-    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> U0
-    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> U0
+    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> U0
+    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> U0
     130:130:com.android.tools.r8.graph.CfCode OptionalMethods_streamDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8008 -> U0
-    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> U0
-    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> U0
+    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> U0
+    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> U0
     131:131:com.android.tools.r8.graph.CfCode OptionalMethods_streamDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8008 -> U0
     1:19:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3924:3942 -> V
     20:20:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3936:3936 -> V
     21:38:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3930:3947 -> V
-    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> V
+    39:39:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> V
     39:39:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3947 -> V
     1:17:com.android.tools.r8.graph.CfCode OptionalMethods_streamInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8012:8028 -> V0
     18:31:com.android.tools.r8.graph.CfCode OptionalMethods_streamInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8025:8038 -> V0
@@ -57497,13 +57253,13 @@
     74:76:com.android.tools.r8.graph.CfCode OptionalMethods_streamInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8063:8065 -> V0
     77:77:com.android.tools.r8.graph.CfCode OptionalMethods_streamInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8061:8061 -> V0
     78:128:com.android.tools.r8.graph.CfCode OptionalMethods_streamInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8020:8070 -> V0
-    129:129:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> V0
+    129:129:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> V0
     129:129:com.android.tools.r8.graph.CfCode OptionalMethods_streamInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8070 -> V0
-    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> V0
-    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> V0
+    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> V0
+    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> V0
     130:130:com.android.tools.r8.graph.CfCode OptionalMethods_streamInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8070 -> V0
-    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> V0
-    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> V0
+    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> V0
+    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> V0
     131:131:com.android.tools.r8.graph.CfCode OptionalMethods_streamInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8070 -> V0
     1:47:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3952:3998 -> W
     48:48:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> W
@@ -57544,13 +57300,13 @@
     382:402:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4273:4293 -> W
     403:403:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4286:4286 -> W
     404:719:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):3983:4298 -> W
-    720:720:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> W
+    720:720:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> W
     720:720:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298 -> W
-    721:721:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> W
-    721:721:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> W
+    721:721:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> W
+    721:721:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> W
     721:721:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298 -> W
-    722:722:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> W
-    722:722:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> W
+    722:722:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> W
+    722:722:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> W
     722:722:com.android.tools.r8.graph.CfCode LongMethods_toUnsignedStringWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4298 -> W
     1:17:com.android.tools.r8.graph.CfCode OptionalMethods_streamLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8074:8090 -> W0
     18:31:com.android.tools.r8.graph.CfCode OptionalMethods_streamLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8087:8100 -> W0
@@ -57564,13 +57320,13 @@
     74:76:com.android.tools.r8.graph.CfCode OptionalMethods_streamLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8125:8127 -> W0
     77:77:com.android.tools.r8.graph.CfCode OptionalMethods_streamLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8123:8123 -> W0
     78:128:com.android.tools.r8.graph.CfCode OptionalMethods_streamLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8082:8132 -> W0
-    129:129:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> W0
+    129:129:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> W0
     129:129:com.android.tools.r8.graph.CfCode OptionalMethods_streamLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8132 -> W0
-    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> W0
-    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> W0
+    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> W0
+    130:130:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> W0
     130:130:com.android.tools.r8.graph.CfCode OptionalMethods_streamLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8132 -> W0
-    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> W0
-    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> W0
+    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> W0
+    131:131:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> W0
     131:131:com.android.tools.r8.graph.CfCode OptionalMethods_streamLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8132 -> W0
     1:40:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4302:4341 -> X
     41:41:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> X
@@ -57578,16 +57334,16 @@
     42:52:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4341:4351 -> X
     53:53:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4348:4348 -> X
     54:98:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4312:4356 -> X
-    99:99:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> X
+    99:99:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> X
     99:99:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356 -> X
-    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> X
-    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> X
+    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> X
+    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> X
     100:100:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356 -> X
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> X
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> X
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> X
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> X
     101:101:com.android.tools.r8.graph.CfCode MathMethods_addExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4356 -> X
     1:15:com.android.tools.r8.graph.CfCode ShortMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8136:8150 -> X0
-    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> X0
+    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> X0
     16:16:com.android.tools.r8.graph.CfCode ShortMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8150 -> X0
     1:36:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4360:4395 -> Y
     37:37:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> Y
@@ -57608,16 +57364,16 @@
     109:119:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4455:4465 -> Y
     120:120:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4462:4462 -> Y
     121:218:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4373:4470 -> Y
-    219:219:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> Y
+    219:219:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> Y
     219:219:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4470 -> Y
-    220:220:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> Y
-    220:220:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> Y
+    220:220:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> Y
+    220:220:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> Y
     220:220:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4470 -> Y
-    221:221:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> Y
-    221:221:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> Y
+    221:221:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> Y
+    221:221:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> Y
     221:221:com.android.tools.r8.graph.CfCode MathMethods_addExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4470 -> Y
     1:19:com.android.tools.r8.graph.CfCode ShortMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8154:8172 -> Y0
-    20:20:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> Y0
+    20:20:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> Y0
     20:20:com.android.tools.r8.graph.CfCode ShortMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8172 -> Y0
     1:22:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4474:4495 -> Z
     23:33:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4492:4502 -> Z
@@ -57625,16 +57381,16 @@
     34:34:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4502 -> Z
     35:36:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4502:4503 -> Z
     37:65:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4482:4510 -> Z
-    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> Z
+    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> Z
     66:66:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> Z
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> Z
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> Z
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> Z
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> Z
     67:67:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> Z
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> Z
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> Z
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> Z
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> Z
     68:68:com.android.tools.r8.graph.CfCode MathMethods_decrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4510 -> Z
     1:15:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8176:8190 -> Z0
-    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> Z0
+    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> Z0
     16:16:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8190 -> Z0
     1:17:com.android.tools.r8.graph.CfCode AtomicReferenceArrayMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):122:138 -> a
     18:23:com.android.tools.r8.graph.CfCode AtomicReferenceArrayMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):137:142 -> a
@@ -57648,13 +57404,13 @@
     71:83:com.android.tools.r8.graph.CfCode AtomicReferenceArrayMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):175:187 -> a
     84:84:com.android.tools.r8.graph.CfCode AtomicReferenceArrayMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):182:182 -> a
     85:150:com.android.tools.r8.graph.CfCode AtomicReferenceArrayMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):131:196 -> a
-    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     151:151:com.android.tools.r8.graph.CfCode AtomicReferenceArrayMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196 -> a
-    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     152:152:com.android.tools.r8.graph.CfCode AtomicReferenceArrayMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196 -> a
-    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     153:153:com.android.tools.r8.graph.CfCode AtomicReferenceArrayMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196 -> a
     1:23:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4514:4536 -> a0
     24:34:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4533:4543 -> a0
@@ -57662,16 +57418,16 @@
     35:35:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4543 -> a0
     36:37:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4543:4544 -> a0
     38:67:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4522:4551 -> a0
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a0
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a0
     68:68:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4551 -> a0
-    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a0
-    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a0
+    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a0
+    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a0
     69:69:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4551 -> a0
-    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a0
-    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a0
+    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a0
+    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a0
     70:70:com.android.tools.r8.graph.CfCode MathMethods_decrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4551 -> a0
     1:16:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8194:8209 -> a1
-    17:17:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a1
+    17:17:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a1
     17:17:com.android.tools.r8.graph.CfCode ShortMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8209 -> a1
     1:17:com.android.tools.r8.graph.CfCode AtomicReferenceFieldUpdaterMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):201:217 -> b
     18:23:com.android.tools.r8.graph.CfCode AtomicReferenceFieldUpdaterMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):216:221 -> b
@@ -57685,13 +57441,13 @@
     71:83:com.android.tools.r8.graph.CfCode AtomicReferenceFieldUpdaterMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):254:266 -> b
     84:84:com.android.tools.r8.graph.CfCode AtomicReferenceFieldUpdaterMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):261:261 -> b
     85:150:com.android.tools.r8.graph.CfCode AtomicReferenceFieldUpdaterMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):210:275 -> b
-    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> b
+    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> b
     151:151:com.android.tools.r8.graph.CfCode AtomicReferenceFieldUpdaterMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):275 -> b
-    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> b
-    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b
+    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> b
+    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b
     152:152:com.android.tools.r8.graph.CfCode AtomicReferenceFieldUpdaterMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):275 -> b
-    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> b
-    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b
+    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> b
+    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b
     153:153:com.android.tools.r8.graph.CfCode AtomicReferenceFieldUpdaterMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):275 -> b
     1:41:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4555:4595 -> b0
     42:42:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b0
@@ -57704,13 +57460,13 @@
     86:86:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4635 -> b0
     87:90:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4635:4638 -> b0
     91:165:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4568:4642 -> b0
-    166:166:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> b0
+    166:166:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> b0
     166:166:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4642 -> b0
-    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> b0
-    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b0
+    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> b0
+    167:167:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b0
     167:167:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4642 -> b0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> b0
-    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> b0
+    168:168:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b0
     168:168:com.android.tools.r8.graph.CfCode MathMethods_floorDivInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4642 -> b0
     1:18:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8213:8230 -> b1
     19:21:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8229:8231 -> b1
@@ -57726,13 +57482,13 @@
     66:66:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8257:8257 -> b1
     67:67:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8256:8256 -> b1
     68:109:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8221:8262 -> b1
-    110:110:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> b1
+    110:110:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> b1
     110:110:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8262 -> b1
-    111:111:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> b1
-    111:111:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b1
+    111:111:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> b1
+    111:111:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b1
     111:111:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8262 -> b1
-    112:112:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> b1
-    112:112:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b1
+    112:112:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> b1
+    112:112:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b1
     112:112:com.android.tools.r8.graph.CfCode StreamMethods_ofNullable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8262 -> b1
     1:17:com.android.tools.r8.graph.CfCode AtomicReferenceMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):280:296 -> c
     18:22:com.android.tools.r8.graph.CfCode AtomicReferenceMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:299 -> c
@@ -57746,13 +57502,13 @@
     64:73:com.android.tools.r8.graph.CfCode AtomicReferenceMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):328:337 -> c
     74:74:com.android.tools.r8.graph.CfCode AtomicReferenceMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):334:334 -> c
     75:132:com.android.tools.r8.graph.CfCode AtomicReferenceMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):289:346 -> c
-    133:133:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> c
+    133:133:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> c
     133:133:com.android.tools.r8.graph.CfCode AtomicReferenceMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> c
-    134:134:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> c
-    134:134:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> c
+    134:134:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> c
+    134:134:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> c
     134:134:com.android.tools.r8.graph.CfCode AtomicReferenceMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> c
-    135:135:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> c
-    135:135:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> c
+    135:135:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> c
+    135:135:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> c
     135:135:com.android.tools.r8.graph.CfCode AtomicReferenceMethods_compareAndSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):346 -> c
     1:43:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4646:4688 -> c0
     44:44:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c0
@@ -57765,13 +57521,13 @@
     90:90:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4730 -> c0
     91:94:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4730:4733 -> c0
     95:173:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4659:4737 -> c0
-    174:174:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> c0
+    174:174:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> c0
     174:174:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4737 -> c0
-    175:175:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> c0
-    175:175:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> c0
+    175:175:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> c0
+    175:175:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> c0
     175:175:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4737 -> c0
-    176:176:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> c0
-    176:176:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> c0
+    176:176:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> c0
+    176:176:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> c0
     176:176:com.android.tools.r8.graph.CfCode MathMethods_floorDivLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4737 -> c0
     1:26:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8266:8291 -> c1
     27:40:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8288:8301 -> c1
@@ -57788,13 +57544,13 @@
     121:121:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8362 -> c1
     122:123:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8362:8363 -> c1
     124:212:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8280:8368 -> c1
-    213:213:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> c1
+    213:213:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> c1
     213:213:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8368 -> c1
-    214:214:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> c1
-    214:214:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> c1
+    214:214:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> c1
+    214:214:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> c1
     214:214:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8368 -> c1
-    215:215:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> c1
-    215:215:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> c1
+    215:215:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> c1
+    215:215:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> c1
     215:215:com.android.tools.r8.graph.CfCode StringMethods_isBlank(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8368 -> c1
     1:23:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):350:372 -> d
     24:24:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> d
@@ -57807,18 +57563,18 @@
     51:51:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):395 -> d
     52:55:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):395:398 -> d
     56:99:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):359:402 -> d
-    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> d
+    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> d
     100:100:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):402 -> d
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> d
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> d
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> d
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> d
     101:101:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):402 -> d
-    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> d
-    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> d
+    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> d
+    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> d
     102:102:com.android.tools.r8.graph.CfCode BooleanMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):402 -> d
     1:20:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4741:4760 -> d0
     21:21:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4754:4754 -> d0
     22:40:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4747:4765 -> d0
-    41:41:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> d0
+    41:41:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> d0
     41:41:com.android.tools.r8.graph.CfCode MathMethods_floorDivLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4765 -> d0
     1:29:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8372:8400 -> d1
     30:44:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8396:8410 -> d1
@@ -57840,13 +57596,13 @@
     168:177:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8500:8509 -> d1
     178:178:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8506:8506 -> d1
     179:306:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8387:8514 -> d1
-    307:307:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> d1
+    307:307:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> d1
     307:307:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8514 -> d1
-    308:308:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> d1
-    308:308:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> d1
+    308:308:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> d1
+    308:308:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> d1
     308:308:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8514 -> d1
-    309:309:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> d1
-    309:309:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> d1
+    309:309:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> d1
+    309:309:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> d1
     309:309:com.android.tools.r8.graph.CfCode StringMethods_joinArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8514 -> d1
     1:19:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):406:424 -> e
     20:20:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> e
@@ -57856,13 +57612,13 @@
     29:29:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):431 -> e
     30:32:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):431:433 -> e
     33:56:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):414:437 -> e
-    57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> e
+    57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> e
     57:57:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437 -> e
-    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> e
-    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> e
+    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> e
+    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> e
     58:58:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437 -> e
-    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> e
-    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> e
+    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> e
+    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> e
     59:59:com.android.tools.r8.graph.CfCode BooleanMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):437 -> e
     1:32:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4769:4800 -> e0
     33:33:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> e0
@@ -57875,13 +57631,13 @@
     75:75:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4838 -> e0
     76:79:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4838:4841 -> e0
     80:144:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4781:4845 -> e0
-    145:145:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> e0
+    145:145:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> e0
     145:145:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4845 -> e0
-    146:146:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> e0
-    146:146:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> e0
+    146:146:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> e0
+    146:146:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> e0
     146:146:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4845 -> e0
-    147:147:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> e0
-    147:147:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> e0
+    147:147:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> e0
+    147:147:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> e0
     147:147:com.android.tools.r8.graph.CfCode MathMethods_floorModInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4845 -> e0
     1:28:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8518:8545 -> e1
     29:42:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8541:8554 -> e1
@@ -57893,7 +57649,7 @@
     72:86:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8571:8585 -> e1
     87:101:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8582:8596 -> e1
     102:102:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8593:8593 -> e1
-    103:103:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> e1
+    103:103:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> e1
     103:103:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8593 -> e1
     104:117:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8593:8606 -> e1
     118:134:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8601:8617 -> e1
@@ -57903,7 +57659,7 @@
     146:162:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8623:8639 -> e1
     163:179:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8634:8650 -> e1
     180:180:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8647:8647 -> e1
-    181:181:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> e1
+    181:181:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> e1
     181:181:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8647 -> e1
     182:195:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8647:8660 -> e1
     196:213:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8655:8672 -> e1
@@ -57912,16 +57668,16 @@
     215:224:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8672:8681 -> e1
     225:225:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8678:8678 -> e1
     226:380:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8532:8686 -> e1
-    381:381:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> e1
+    381:381:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> e1
     381:381:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8686 -> e1
-    382:382:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> e1
-    382:382:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> e1
+    382:382:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> e1
+    382:382:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> e1
     382:382:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8686 -> e1
-    383:383:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> e1
-    383:383:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> e1
+    383:383:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> e1
+    383:383:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> e1
     383:383:com.android.tools.r8.graph.CfCode StringMethods_joinIterable(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8686 -> e1
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):441:455 -> f
-    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> f
+    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> f
     16:16:com.android.tools.r8.graph.CfCode ByteMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):455 -> f
     1:34:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4849:4882 -> f0
     35:35:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> f0
@@ -57934,13 +57690,13 @@
     79:79:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4922 -> f0
     80:83:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4922:4925 -> f0
     84:152:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4861:4929 -> f0
-    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> f0
+    153:153:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> f0
     153:153:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929 -> f0
-    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> f0
-    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> f0
+    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> f0
+    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> f0
     154:154:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929 -> f0
-    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> f0
-    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> f0
+    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> f0
+    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> f0
     155:155:com.android.tools.r8.graph.CfCode MathMethods_floorModLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4929 -> f0
     1:36:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8690:8725 -> f1
     37:49:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8722:8734 -> f1
@@ -57984,21 +57740,21 @@
     390:399:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8982:8991 -> f1
     400:400:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8988:8988 -> f1
     401:686:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8711:8996 -> f1
-    687:687:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> f1
+    687:687:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> f1
     687:687:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8996 -> f1
-    688:688:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> f1
-    688:688:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> f1
+    688:688:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> f1
+    688:688:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> f1
     688:688:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8996 -> f1
-    689:689:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> f1
-    689:689:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> f1
+    689:689:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> f1
+    689:689:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> f1
     689:689:com.android.tools.r8.graph.CfCode StringMethods_repeat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):8996 -> f1
     1:19:com.android.tools.r8.graph.CfCode ByteMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):459:477 -> g
-    20:20:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> g
+    20:20:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> g
     20:20:com.android.tools.r8.graph.CfCode ByteMethods_compareUnsigned(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):477 -> g
     1:20:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4933:4952 -> g0
     21:21:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4946:4946 -> g0
     22:41:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4939:4958 -> g0
-    42:42:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> g0
+    42:42:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> g0
     42:42:com.android.tools.r8.graph.CfCode MathMethods_floorModLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4958 -> g0
     1:32:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9000:9031 -> g1
     33:46:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9028:9041 -> g1
@@ -58025,16 +57781,16 @@
     216:230:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9169:9183 -> g1
     231:231:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9177:9177 -> g1
     232:400:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9020:9188 -> g1
-    401:401:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> g1
+    401:401:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> g1
     401:401:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9188 -> g1
-    402:402:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> g1
-    402:402:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> g1
+    402:402:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> g1
+    402:402:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> g1
     402:402:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9188 -> g1
-    403:403:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> g1
-    403:403:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> g1
+    403:403:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> g1
+    403:403:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> g1
     403:403:com.android.tools.r8.graph.CfCode StringMethods_strip(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9188 -> g1
     1:15:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):481:495 -> h
-    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> h
+    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> h
     16:16:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):495 -> h
     1:22:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4962:4983 -> h0
     23:33:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4980:4990 -> h0
@@ -58042,13 +57798,13 @@
     34:34:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4990 -> h0
     35:36:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4990:4991 -> h0
     37:65:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4970:4998 -> h0
-    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> h0
+    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> h0
     66:66:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> h0
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> h0
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> h0
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> h0
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> h0
     67:67:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> h0
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> h0
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> h0
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> h0
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> h0
     68:68:com.android.tools.r8.graph.CfCode MathMethods_incrementExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):4998 -> h0
     1:26:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9192:9217 -> h1
     27:40:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9214:9227 -> h1
@@ -58066,16 +57822,16 @@
     124:138:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9290:9304 -> h1
     139:139:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9298:9298 -> h1
     140:243:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9206:9309 -> h1
-    244:244:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> h1
+    244:244:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> h1
     244:244:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9309 -> h1
-    245:245:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> h1
-    245:245:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> h1
+    245:245:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> h1
+    245:245:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> h1
     245:245:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9309 -> h1
-    246:246:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> h1
-    246:246:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> h1
+    246:246:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> h1
+    246:246:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> h1
     246:246:com.android.tools.r8.graph.CfCode StringMethods_stripLeading(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9309 -> h1
     1:16:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):499:514 -> i
-    17:17:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> i
+    17:17:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> i
     17:17:com.android.tools.r8.graph.CfCode ByteMethods_toUnsignedLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):514 -> i
     1:23:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5002:5024 -> i0
     24:34:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5021:5031 -> i0
@@ -58083,13 +57839,13 @@
     35:35:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5031 -> i0
     36:37:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5031:5032 -> i0
     38:67:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5010:5039 -> i0
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> i0
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> i0
     68:68:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5039 -> i0
-    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> i0
-    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> i0
+    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> i0
+    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> i0
     69:69:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5039 -> i0
-    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> i0
-    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> i0
+    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> i0
+    70:70:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> i0
     70:70:com.android.tools.r8.graph.CfCode MathMethods_incrementExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5039 -> i0
     1:22:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9313:9334 -> i1
     23:35:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9331:9343 -> i1
@@ -58107,13 +57863,13 @@
     120:134:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9405:9419 -> i1
     135:135:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9413:9413 -> i1
     136:234:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9326:9424 -> i1
-    235:235:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> i1
+    235:235:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> i1
     235:235:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9424 -> i1
-    236:236:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> i1
-    236:236:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> i1
+    236:236:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> i1
+    236:236:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> i1
     236:236:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9424 -> i1
-    237:237:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> i1
-    237:237:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> i1
+    237:237:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> i1
+    237:237:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> i1
     237:237:com.android.tools.r8.graph.CfCode StringMethods_stripTrailing(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9424 -> i1
     1:27:com.android.tools.r8.graph.CfCode CharSequenceMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):518:544 -> j
     28:41:com.android.tools.r8.graph.CfCode CharSequenceMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):541:554 -> j
@@ -58134,13 +57890,13 @@
     178:178:com.android.tools.r8.graph.CfCode CharSequenceMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):663 -> j
     179:181:com.android.tools.r8.graph.CfCode CharSequenceMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):663:665 -> j
     182:318:com.android.tools.r8.graph.CfCode CharSequenceMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):536:672 -> j
-    319:319:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> j
+    319:319:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> j
     319:319:com.android.tools.r8.graph.CfCode CharSequenceMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):672 -> j
-    320:320:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> j
-    320:320:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> j
+    320:320:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> j
+    320:320:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> j
     320:320:com.android.tools.r8.graph.CfCode CharSequenceMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):672 -> j
-    321:321:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> j
-    321:321:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> j
+    321:321:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> j
+    321:321:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> j
     321:321:com.android.tools.r8.graph.CfCode CharSequenceMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):672 -> j
     1:40:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5043:5082 -> j0
     41:41:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> j0
@@ -58148,19 +57904,19 @@
     42:52:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5082:5092 -> j0
     53:53:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5089:5089 -> j0
     54:98:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5053:5097 -> j0
-    99:99:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> j0
+    99:99:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> j0
     99:99:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5097 -> j0
-    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> j0
-    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> j0
+    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> j0
+    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> j0
     100:100:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5097 -> j0
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> j0
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> j0
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> j0
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> j0
     101:101:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5097 -> j0
     1:7:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9428:9434 -> j1
-    8:8:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> j1
+    8:8:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> j1
     8:8:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9434 -> j1
     9:18:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9434:9443 -> j1
-    19:19:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> j1
+    19:19:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> j1
     19:19:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9443 -> j1
     20:32:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9443:9455 -> j1
     33:37:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9452:9456 -> j1
@@ -58177,16 +57933,16 @@
     107:109:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9500:9502 -> j1
     110:182:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9438:9510 -> j1
     183:189:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9505:9511 -> j1
-    190:190:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> j1
+    190:190:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> j1
     190:190:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9511 -> j1
-    191:191:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> j1
-    191:191:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> j1
+    191:191:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> j1
+    191:191:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> j1
     191:191:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9511 -> j1
-    192:192:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> j1
-    192:192:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> j1
+    192:192:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> j1
+    192:192:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> j1
     192:192:com.android.tools.r8.graph.CfCode ThrowableMethods_addSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9511 -> j1
     1:15:com.android.tools.r8.graph.CfCode CharacterMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):676:690 -> k
-    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> k
+    16:16:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> k
     16:16:com.android.tools.r8.graph.CfCode CharacterMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):690 -> k
     1:32:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5101:5132 -> k0
     33:49:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5128:5144 -> k0
@@ -58217,23 +57973,23 @@
     228:238:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5291:5301 -> k0
     239:239:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5298:5298 -> k0
     240:424:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5122:5306 -> k0
-    425:425:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> k0
+    425:425:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> k0
     425:425:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5306 -> k0
-    426:426:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> k0
-    426:426:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> k0
+    426:426:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> k0
+    426:426:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> k0
     426:426:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5306 -> k0
-    427:427:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> k0
-    427:427:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> k0
+    427:427:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> k0
+    427:427:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> k0
     427:427:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5306 -> k0
     1:7:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9515:9521 -> k1
-    8:8:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> k1
+    8:8:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> k1
     8:8:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9521 -> k1
     9:26:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9521:9538 -> k1
     27:31:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9535:9539 -> k1
     32:53:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9533:9554 -> k1
     54:58:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9551:9555 -> k1
     59:67:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9549:9557 -> k1
-    68:68:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> k1
+    68:68:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> k1
     68:68:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9557 -> k1
     69:76:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9557:9564 -> k1
     77:77:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> k1
@@ -58243,24 +57999,24 @@
     84:90:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9566:9572 -> k1
     91:146:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9525:9580 -> k1
     147:153:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9575:9581 -> k1
-    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> k1
+    154:154:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> k1
     154:154:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9581 -> k1
-    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> k1
-    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> k1
+    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> k1
+    155:155:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> k1
     155:155:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9581 -> k1
-    156:156:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> k1
-    156:156:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> k1
+    156:156:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> k1
+    156:156:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> k1
     156:156:com.android.tools.r8.graph.CfCode ThrowableMethods_getSuppressed(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9581 -> k1
     1:18:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):695:712 -> l
     19:31:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):708:720 -> l
     32:32:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):716:716 -> l
     33:57:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):701:725 -> l
-    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> l
+    58:58:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> l
     58:58:com.android.tools.r8.graph.CfCode CharacterMethods_toStringCodepoint(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):725 -> l
     1:20:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5310:5329 -> l0
     21:21:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5323:5323 -> l0
     22:40:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5316:5334 -> l0
-    41:41:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> l0
+    41:41:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> l0
     41:41:com.android.tools.r8.graph.CfCode MathMethods_multiplyExactLongInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5334 -> l0
     1:20:com.android.tools.r8.graph.CfCode UnsafeMethods_compareAndSwapObject(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9586:9605 -> l1
     21:21:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> l1
@@ -58272,16 +58028,16 @@
     66:80:com.android.tools.r8.graph.CfCode UnsafeMethods_compareAndSwapObject(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9638:9652 -> l1
     81:81:com.android.tools.r8.graph.CfCode UnsafeMethods_compareAndSwapObject(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9646:9646 -> l1
     82:148:com.android.tools.r8.graph.CfCode UnsafeMethods_compareAndSwapObject(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9595:9661 -> l1
-    149:149:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> l1
+    149:149:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> l1
     149:149:com.android.tools.r8.graph.CfCode UnsafeMethods_compareAndSwapObject(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9661 -> l1
-    150:150:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> l1
-    150:150:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> l1
+    150:150:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> l1
+    150:150:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> l1
     150:150:com.android.tools.r8.graph.CfCode UnsafeMethods_compareAndSwapObject(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9661 -> l1
-    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> l1
-    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> l1
+    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> l1
+    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> l1
     151:151:com.android.tools.r8.graph.CfCode UnsafeMethods_compareAndSwapObject(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):9661 -> l1
     1:23:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):730:752 -> m
-    24:24:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> m
+    24:24:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> m
     24:24:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):752 -> m
     25:42:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):752:769 -> m
     43:55:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):766:778 -> m
@@ -58325,10 +58081,10 @@
     381:381:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> m
     381:381:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):997 -> m
     382:385:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):997:1000 -> m
-    386:386:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> m
+    386:386:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> m
     386:386:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1000 -> m
     387:396:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1000:1009 -> m
-    397:397:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> m
+    397:397:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> m
     397:397:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1009 -> m
     398:410:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1009:1021 -> m
     411:415:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1018:1022 -> m
@@ -58356,16 +58112,16 @@
     892:899:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1123:1130 -> m
     900:913:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1129:1142 -> m
     914:961:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1096:1143 -> m
-    962:962:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> m
+    962:962:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> m
     962:962:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> m
-    963:963:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> m
-    963:963:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> m
+    963:963:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> m
+    963:963:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> m
     963:963:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> m
-    964:964:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> m
-    964:964:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> m
+    964:964:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> m
+    964:964:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> m
     964:964:com.android.tools.r8.graph.CfCode CloseResourceMethod_closeResourceImpl(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1143 -> m
     1:17:com.android.tools.r8.graph.CfCode MathMethods_multiplyFull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5338:5354 -> m0
-    18:18:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> m0
+    18:18:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> m0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_multiplyFull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5354 -> m0
     1:24:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1147:1170 -> n
     25:47:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1166:1188 -> n
@@ -58381,23 +58137,23 @@
     116:119:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1238:1241 -> n
     120:120:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1236:1236 -> n
     121:209:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1158:1246 -> n
-    210:210:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> n
+    210:210:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> n
     210:210:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1246 -> n
-    211:211:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> n
-    211:211:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> n
+    211:211:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> n
+    211:211:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> n
     211:211:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1246 -> n
-    212:212:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> n
-    212:212:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> n
+    212:212:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> n
+    212:212:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> n
     212:212:com.android.tools.r8.graph.CfCode CollectionMethods_listOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1246 -> n
     1:101:com.android.tools.r8.graph.CfCode MathMethods_multiplyHigh(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5358:5458 -> n0
-    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> n0
+    102:102:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> n0
     102:102:com.android.tools.r8.graph.CfCode MathMethods_multiplyHigh(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5458 -> n0
     1:23:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1250:1272 -> o
     24:38:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1268:1282 -> o
     39:53:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1278:1292 -> o
     54:54:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1286:1286 -> o
     55:94:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1259:1298 -> o
-    95:95:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> o
+    95:95:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> o
     95:95:com.android.tools.r8.graph.CfCode CollectionMethods_mapEntry(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1298 -> o
     1:22:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5462:5483 -> o0
     23:33:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5480:5490 -> o0
@@ -58405,13 +58161,13 @@
     34:34:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5490 -> o0
     35:36:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5490:5491 -> o0
     37:64:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5470:5497 -> o0
-    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> o0
+    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> o0
     65:65:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5497 -> o0
-    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> o0
-    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> o0
+    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> o0
+    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> o0
     66:66:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5497 -> o0
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> o0
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> o0
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> o0
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> o0
     67:67:com.android.tools.r8.graph.CfCode MathMethods_negateExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5497 -> o0
     1:27:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1302:1328 -> p
     28:49:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1324:1345 -> p
@@ -58442,13 +58198,13 @@
     259:262:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1488:1491 -> p
     263:263:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1486:1486 -> p
     264:444:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1316:1496 -> p
-    445:445:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> p
+    445:445:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> p
     445:445:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1496 -> p
-    446:446:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> p
-    446:446:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> p
+    446:446:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> p
+    446:446:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> p
     446:446:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1496 -> p
-    447:447:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> p
-    447:447:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> p
+    447:447:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> p
+    447:447:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> p
     447:447:com.android.tools.r8.graph.CfCode CollectionMethods_mapOfEntries(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1496 -> p
     1:23:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5501:5523 -> p0
     24:34:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5520:5530 -> p0
@@ -58456,13 +58212,13 @@
     35:35:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5530 -> p0
     36:37:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5530:5531 -> p0
     38:66:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5509:5537 -> p0
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> p0
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> p0
     67:67:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5537 -> p0
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> p0
-    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> p0
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> p0
+    68:68:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> p0
     68:68:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5537 -> p0
-    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> p0
-    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> p0
+    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> p0
+    69:69:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> p0
     69:69:com.android.tools.r8.graph.CfCode MathMethods_negateExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5537 -> p0
     1:25:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1500:1524 -> q
     26:50:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1520:1544 -> q
@@ -58485,18 +58241,18 @@
     196:199:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1648:1651 -> q
     200:200:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1646:1646 -> q
     201:345:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1512:1656 -> q
-    346:346:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> q
+    346:346:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> q
     346:346:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1656 -> q
-    347:347:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> q
-    347:347:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> q
+    347:347:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> q
+    347:347:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> q
     347:347:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1656 -> q
-    348:348:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> q
-    348:348:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> q
+    348:348:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> q
+    348:348:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> q
     348:348:com.android.tools.r8.graph.CfCode CollectionMethods_setOfArray(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1656 -> q
     1:17:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5541:5557 -> q0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5553:5553 -> q0
     19:35:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5547:5563 -> q0
-    36:36:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> q0
+    36:36:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> q0
     36:36:com.android.tools.r8.graph.CfCode MathMethods_nextDownDouble(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5563 -> q0
     1:22:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfList(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1660:1681 -> r
     23:34:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfList(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1678:1689 -> r
@@ -58519,18 +58275,18 @@
     158:161:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfList(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1770:1773 -> r
     162:162:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfList(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1768:1768 -> r
     163:270:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfList(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1671:1778 -> r
-    271:271:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> r
+    271:271:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> r
     271:271:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfList(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1778 -> r
-    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> r
-    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> r
+    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> r
+    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> r
     272:272:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfList(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1778 -> r
-    273:273:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> r
-    273:273:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> r
+    273:273:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> r
+    273:273:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> r
     273:273:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfList(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1778 -> r
     1:17:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5567:5583 -> r0
     18:18:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5579:5579 -> r0
     19:35:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5573:5589 -> r0
-    36:36:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> r0
+    36:36:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> r0
     36:36:com.android.tools.r8.graph.CfCode MathMethods_nextDownFloat(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5589 -> r0
     1:25:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1782:1806 -> s
     26:37:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1803:1814 -> s
@@ -58544,7 +58300,7 @@
     87:96:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1843:1852 -> s
     97:109:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1849:1861 -> s
     110:115:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1858:1863 -> s
-    116:116:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> s
+    116:116:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> s
     116:116:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1863 -> s
     117:128:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1863:1874 -> s
     129:140:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1871:1882 -> s
@@ -58558,13 +58314,13 @@
     213:216:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1929:1932 -> s
     217:217:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1927:1927 -> s
     218:359:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1796:1937 -> s
-    360:360:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> s
+    360:360:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> s
     360:360:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1937 -> s
-    361:361:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> s
-    361:361:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> s
+    361:361:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> s
+    361:361:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> s
     361:361:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1937 -> s
-    362:362:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> s
-    362:362:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> s
+    362:362:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> s
+    362:362:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> s
     362:362:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfMap(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1937 -> s
     1:40:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5593:5632 -> s0
     41:41:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> s0
@@ -58572,13 +58328,13 @@
     42:52:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5632:5642 -> s0
     53:53:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5639:5639 -> s0
     54:98:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5603:5647 -> s0
-    99:99:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> s0
+    99:99:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> s0
     99:99:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5647 -> s0
-    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> s0
-    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> s0
+    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> s0
+    100:100:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> s0
     100:100:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5647 -> s0
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> s0
-    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> s0
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> s0
+    101:101:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> s0
     101:101:com.android.tools.r8.graph.CfCode MathMethods_subtractExactInt(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5647 -> s0
     1:22:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1941:1962 -> t
     23:34:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1959:1970 -> t
@@ -58600,13 +58356,13 @@
     155:158:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2050:2053 -> t
     159:159:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2048:2048 -> t
     160:266:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1952:2058 -> t
-    267:267:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> t
+    267:267:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> t
     267:267:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2058 -> t
-    268:268:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> t
-    268:268:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> t
+    268:268:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> t
+    268:268:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> t
     268:268:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2058 -> t
-    269:269:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> t
-    269:269:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> t
+    269:269:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> t
+    269:269:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> t
     269:269:com.android.tools.r8.graph.CfCode CollectionsMethods_copyOfSet(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2058 -> t
     1:36:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5651:5686 -> t0
     37:37:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> t0
@@ -58627,13 +58383,13 @@
     109:119:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5746:5756 -> t0
     120:120:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5753:5753 -> t0
     121:218:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5664:5761 -> t0
-    219:219:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> t0
+    219:219:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> t0
     219:219:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5761 -> t0
-    220:220:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> t0
-    220:220:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> t0
+    220:220:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> t0
+    220:220:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> t0
     220:220:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5761 -> t0
-    221:221:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> t0
-    221:221:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> t0
+    221:221:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> t0
+    221:221:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> t0
     221:221:com.android.tools.r8.graph.CfCode MathMethods_subtractExactLong(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5761 -> t0
     1:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2063:2075 -> u
     14:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2074:2076 -> u
@@ -58641,7 +58397,7 @@
     30:33:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2082:2085 -> u
     34:34:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2080:2080 -> u
     35:56:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2068:2089 -> u
-    57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> u
+    57:57:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> u
     57:57:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyEnumeration(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2089 -> u
     1:29:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5765:5793 -> u0
     30:42:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5790:5802 -> u0
@@ -58649,13 +58405,13 @@
     43:43:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5802 -> u0
     44:46:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5802:5804 -> u0
     47:82:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5774:5809 -> u0
-    83:83:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> u0
+    83:83:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> u0
     83:83:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5809 -> u0
-    84:84:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> u0
-    84:84:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> u0
+    84:84:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> u0
+    84:84:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> u0
     84:84:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5809 -> u0
-    85:85:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> u0
-    85:85:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> u0
+    85:85:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> u0
+    85:85:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> u0
     85:85:com.android.tools.r8.graph.CfCode MathMethods_toIntExact(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5809 -> u0
     1:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2093:2105 -> v
     14:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2104:2106 -> v
@@ -58663,7 +58419,7 @@
     29:31:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2112:2114 -> v
     32:32:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2110:2110 -> v
     33:53:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2098:2118 -> v
-    54:54:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> v
+    54:54:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> v
     54:54:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2118 -> v
     1:29:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5814:5842 -> v0
     30:30:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> v0
@@ -58684,13 +58440,13 @@
     194:194:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5951 -> v0
     195:197:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5951:5953 -> v0
     198:334:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5822:5958 -> v0
-    335:335:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> v0
+    335:335:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> v0
     335:335:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5958 -> v0
-    336:336:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> v0
-    336:336:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> v0
+    336:336:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> v0
+    336:336:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> v0
     336:336:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5958 -> v0
-    337:337:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> v0
-    337:337:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> v0
+    337:337:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> v0
+    337:337:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> v0
     337:337:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromIndexSize(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5958 -> v0
     1:13:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2123:2135 -> w
     14:16:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2134:2136 -> w
@@ -58698,7 +58454,7 @@
     29:31:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2142:2144 -> w
     32:32:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2140:2140 -> w
     33:53:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2128:2148 -> w
-    54:54:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> w
+    54:54:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> w
     54:54:com.android.tools.r8.graph.CfCode CollectionsMethods_emptyListIterator(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2148 -> w
     1:26:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5962:5987 -> w0
     27:27:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> w0
@@ -58717,18 +58473,18 @@
     163:163:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6078 -> w0
     164:166:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6078:6080 -> w0
     167:282:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):5970:6085 -> w0
-    283:283:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> w0
+    283:283:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> w0
     283:283:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6085 -> w0
-    284:284:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> w0
-    284:284:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> w0
+    284:284:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> w0
+    284:284:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> w0
     284:284:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6085 -> w0
-    285:285:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> w0
-    285:285:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> w0
+    285:285:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> w0
+    285:285:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> w0
     285:285:com.android.tools.r8.graph.CfCode ObjectsMethods_checkFromToIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6085 -> w0
     1:17:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2152:2168 -> x
     18:18:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2164:2164 -> x
     19:41:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2159:2181 -> x
-    42:42:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> x
+    42:42:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> x
     42:42:com.android.tools.r8.graph.CfCode DoubleMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2181 -> x
     1:22:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6089:6110 -> x0
     23:23:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> x0
@@ -58745,13 +58501,13 @@
     130:130:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6182 -> x0
     131:133:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6182:6184 -> x0
     134:226:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6097:6189 -> x0
-    227:227:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> x0
+    227:227:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> x0
     227:227:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6189 -> x0
-    228:228:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> x0
-    228:228:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> x0
+    228:228:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> x0
+    228:228:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> x0
     228:228:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6189 -> x0
-    229:229:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> x0
-    229:229:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> x0
+    229:229:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> x0
+    229:229:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> x0
     229:229:com.android.tools.r8.graph.CfCode ObjectsMethods_checkIndex(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6189 -> x0
     1:18:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2185:2202 -> y
     19:33:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2198:2212 -> y
@@ -58763,13 +58519,13 @@
     57:57:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2228 -> y
     58:60:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2228:2230 -> y
     61:102:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2193:2234 -> y
-    103:103:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> y
+    103:103:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> y
     103:103:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2234 -> y
-    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> y
-    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> y
+    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> y
+    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> y
     104:104:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2234 -> y
-    105:105:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> y
-    105:105:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> y
+    105:105:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> y
+    105:105:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> y
     105:105:com.android.tools.r8.graph.CfCode DoubleMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2234 -> y
     1:24:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6193:6216 -> y0
     25:25:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6215:6215 -> y0
@@ -58782,13 +58538,13 @@
     61:61:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6239 -> y0
     62:66:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6239:6243 -> y0
     67:113:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6201:6247 -> y0
-    114:114:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> y0
+    114:114:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> y0
     114:114:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6247 -> y0
-    115:115:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> y0
-    115:115:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> y0
+    115:115:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> y0
+    115:115:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> y0
     115:115:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6247 -> y0
-    116:116:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> y0
-    116:116:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> y0
+    116:116:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> y0
+    116:116:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> y0
     116:116:com.android.tools.r8.graph.CfCode ObjectsMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6247 -> y0
     1:18:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2238:2255 -> z
     19:33:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2251:2265 -> z
@@ -58800,13 +58556,13 @@
     57:57:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2281 -> z
     58:60:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2281:2283 -> z
     61:102:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2246:2287 -> z
-    103:103:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> z
+    103:103:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> z
     103:103:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2287 -> z
-    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> z
-    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> z
+    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> z
+    104:104:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> z
     104:104:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2287 -> z
-    105:105:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> z
-    105:105:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> z
+    105:105:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> z
+    105:105:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> z
     105:105:com.android.tools.r8.graph.CfCode FloatMethods_isFinite(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2287 -> z
     1:93:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6251:6343 -> z0
     94:154:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6337:6397 -> z0
@@ -58821,48 +58577,48 @@
     586:635:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6769:6818 -> z0
     636:636:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6814:6814 -> z0
     637:1165:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6295:6823 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.y5:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.x5:
     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.Vb:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.Ub:
     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:33: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:63 -> 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.Wb:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.Vb:
     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.Ik:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.Dk:
     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.XC:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.QC:
     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.XH:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.NH:
     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.WH:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.MH:
     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.rK:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.hK:
     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.qK:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.gK:
     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.JK:
+com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.zK:
     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
@@ -58874,10 +58630,10 @@
     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.uV:
+com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.kV:
     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.td:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.sd:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean isFinalBootstrapMethodReferenceOnInterface -> i
@@ -58934,7 +58690,7 @@
     31:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):281:294 -> a
     31:44:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     31:44:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):234 -> a
-    45:45:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    45:45:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     45:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):294 -> a
     45:45:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     45:45:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):234 -> a
@@ -58945,7 +58701,7 @@
     54:58:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):303 -> a
     54:58:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     54:58:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):234 -> a
-    59:59:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    59:59:void com.android.tools.r8.cf.code.CfConstClass.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     59:59:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.invokeBootstrapMethod(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):268 -> a
     59:59:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):303 -> a
     59:59:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
@@ -58954,7 +58710,7 @@
     60:66:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):303 -> a
     60:66:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     60:66:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):234 -> a
-    67:67:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    67:67:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     67:67:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.invokeBootstrapMethod(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):274 -> a
     67:67:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):303 -> a
     67:67:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
@@ -58981,17 +58737,17 @@
     134:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):340:355 -> a
     134:149:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     134:149:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):234 -> a
-    150:150:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    150:150:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     150:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):355 -> a
     150:150:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     150:150:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):234 -> a
-    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    151:151:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     151:151:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):355 -> a
     151:151:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     151:151:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):234 -> a
-    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    152:152:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     152:152:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.generateGetterCode(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):355 -> a
     152:152:void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass.synthesizeDirectMethods(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
     152:152:void synthesizeConstantDynamicClass(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):234 -> a
@@ -59008,25 +58764,25 @@
     172:172:java.util.List com.android.tools.r8.utils.ListUtils.mapOrElse(java.util.List,java.util.function.Function):176:176 -> a
     172:172:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):426 -> a
     173:180:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):432:439 -> a
-    181:181:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    181:181:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     181:181:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):439 -> a
-    182:182:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    182:182:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    182:182:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    182:182:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     182:182:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):439 -> a
-    183:183:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    183:183:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    183:183:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    183:183:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     183:183:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):439 -> a
     184:185:com.android.tools.r8.cf.code.CfInstruction lambda$adaptCode$1(com.android.tools.r8.cf.code.CfInstruction):429:430 -> a
     1:33:void rewriteBootstrapMethodSignatureIfNeeded():372:404 -> b
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     34:34:void rewriteBootstrapMethodSignatureIfNeeded():404 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     35:35:void rewriteBootstrapMethodSignatureIfNeeded():404 -> b
     36:44:void rewriteBootstrapMethodSignatureIfNeeded():404:412 -> b
     45:60:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):383:398 -> b
     1:2:boolean shouldRewriteBootstrapMethodSignature():175:176 -> c
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.ud:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.td:
     java.util.Map dynamicConstantSyntheticsPerClass -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):33:33 -> <init>
@@ -59046,7 +58802,7 @@
     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):124:124 -> 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):90:92 -> 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):91:104 -> b
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.vd:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.ud:
     java.lang.Object[] bootstrapMethodArguments -> d
     com.android.tools.r8.graph.DexString name -> a
     boolean $assertionsDisabled -> e
@@ -59060,32 +58816,32 @@
     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.DesugaredLibraryAmender -> com.android.tools.r8.internal.Jf:
-    com.android.tools.r8.androidapi.ComputedApiLevel minAPILevel -> c
-    com.android.tools.r8.graph.DexDefinitionSupplier definitions -> a
-    com.android.tools.r8.utils.Reporter reporter -> b
-    1:4:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,com.android.tools.r8.androidapi.ComputedApiLevel):48:51 -> <init>
-    1:4:void run(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.utils.Reporter,com.android.tools.r8.androidapi.ComputedApiLevel):41:44 -> a
-    5:5:void run(java.util.Map):55:55 -> a
-    6:6:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):59:59 -> a
-    7:7:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    7:7:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):60 -> a
-    8:18:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):69:79 -> a
-    19:24:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):62:62 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification -> com.android.tools.r8.internal.Uf:
-    1:1:void <clinit>():16:16 -> <clinit>
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender -> com.android.tools.r8.internal.Ef:
+    com.android.tools.r8.graph.AppView appView -> a
+    1:2:void <init>(com.android.tools.r8.graph.AppView):34:35 -> <init>
+    1:1:void run(com.android.tools.r8.graph.AppView):24:24 -> a
+    2:5:void run(com.android.tools.r8.graph.AppView,java.util.Map):28:31 -> a
+    6:6:void run(java.util.Map):39:39 -> a
+    7:7:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):43:43 -> a
+    8:8:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    8:8:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):44 -> a
+    9:19:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):56:66 -> a
+    20:27:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):46:53 -> a
+    28:28:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):49:49 -> a
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification -> com.android.tools.r8.internal.Pf:
+    1:1:void <clinit>():17:17 -> <clinit>
     java.lang.String getJsonSource() -> a
-    com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,com.android.tools.r8.utils.Timing,java.nio.file.Path) -> a
-    com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Timing) -> a
-    1:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,com.android.tools.r8.utils.Timing):47:48 -> a
+    com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp) -> a
+    com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,java.nio.file.Path) -> a
+    1:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path):55:56 -> a
     boolean isLibraryCompilation() -> b
     com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel() -> c
     java.util.List getExtraKeepRules() -> d
     java.lang.String getSynthesizedLibraryClassesPackagePrefix() -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.Of:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():47:47 -> <clinit>
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Vf:
+    1:1:void <clinit>():55:55 -> <clinit>
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Qf:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:20:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification parseDesugaredLibrarySpecification(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):30:49 -> a
@@ -59094,9 +58850,9 @@
     41:41:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification parseDesugaredLibrarySpecificationforTesting(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int,java.util.function.Consumer):68:68 -> a
     42:51:boolean isHumanSpecification(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):82:91 -> a
     52:52:boolean isHumanSpecification(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):83:83 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder -> com.android.tools.r8.internal.EY:
+com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder -> com.android.tools.r8.internal.uY:
     com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder setSupportAllCallbacksFromLibrary(boolean) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.xf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.sf:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -59115,20 +58871,20 @@
     7:12:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):59:64 -> a
     13:37:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):102:126 -> a
     13:37:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     38:38:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):126 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     38:38:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     39:39:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):126 -> a
     39:39:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     40:41:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):130:131 -> a
     40:41:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     42:42:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):131 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     42:42:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     43:43:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):131 -> a
     43:43:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     44:44:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):134:134 -> a
@@ -59156,15 +58912,15 @@
     103:103:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     103:103:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
     104:104:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     105:105:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     106:106:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
     107:113:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):181:187 -> a
     107:113:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):160 -> a
     114:120:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):163:169 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.If:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.Df:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set precedingDesugarings -> c
@@ -59285,76 +59041,76 @@
     417:424: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):415:422 -> a
     425:441: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):420:436 -> a
     442:453: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):435:446 -> a
-    454:454:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    454:454:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     454:454: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):446 -> a
     455:456: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):446:447 -> a
-    457:457:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):754:754 -> a
+    457:457:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):752:752 -> a
     457:457: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):447 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    458:459:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):754:755 -> a
+    458:459:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):752:753 -> a
     458:459: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):447 -> a
     460:460: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:448 -> a
-    461:461:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    461:461:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     461:461: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):447 -> a
     462:462: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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":471,"2":472,"3":473,"4":474,"5":475}}
-    471:471:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    471:471:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     471:471: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):447 -> a
-    472:472:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    472:472:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     472:472: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):447 -> a
-    473:473:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    473:473:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     473:473: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):447 -> a
-    474:474:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    474:474:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     474:474: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):447 -> a
-    475:475:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    475:475:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     475:475: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):447 -> a
-    463:463:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):757:757 -> a
+    463:463:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):755:755 -> a
     463:463: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):447 -> a
     464:464: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):450:450 -> a
-    465:465:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    465:465:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     465:465: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):450 -> a
     466:470: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):450:454 -> a
     476:480:void lambda$addOutlineParameterConversionInstructions$2(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.synthesis.SyntheticMethodBuilder):426:430 -> a
     481:481:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432:432 -> a
     482:495:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):459:472 -> a
     482:495:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    496:496:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):764:764 -> a
+    496:496:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):762:762 -> a
     496:496:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     496:496:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    497:497:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):764:764 -> a
+    497:497:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):762:762 -> a
     497:497:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     497:497:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    498:498:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):779:779 -> a
-    498:498:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765 -> a
+    498:498:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):777:777 -> a
+    498:498:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):763 -> a
     498:498:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     498:498:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    499:500:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):769:770 -> a
+    499:500:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:768 -> a
     499:500:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     499:500:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
     501:501:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):473:473 -> a
     501:501:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    502:502:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    502:502:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     502:502:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     502:502:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
     503:503:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":517,"2":518,"3":519,"4":520,"5":521}}
-    517:517:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    517:517:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     517:517:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     517:517:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    518:518:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    518:518:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     518:518:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     518:518:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    519:519:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    519:519:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     519:519:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     519:519:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    520:520:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    520:520:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     520:520:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     520:520:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    521:521:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    521:521:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     521:521:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     521:521:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
-    504:504:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):767:767 -> a
+    504:504:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):765:765 -> a
     504:504:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):472 -> a
     504:504:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):432 -> a
     505:516:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):475:486 -> a
@@ -59369,7 +59125,7 @@
     566:570:void lambda$createOutlinedAPIConversion$4(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):530:534 -> a
     571:577:com.android.tools.r8.graph.Code lambda$createOutlinedAPIConversion$3(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):536:542 -> a
     1:1:void generateTrackingWarnings():214:214 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.Kf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.Ff:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -59390,27 +59146,27 @@
     87:93:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):147:153 -> a
     94:96:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):152:154 -> a
     97:101:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):160:164 -> a
-    102:102:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    102:102:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     102:102:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):164 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    103:103:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    103:103:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     103:103:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):164 -> a
     104:110:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):164:170 -> a
-    111:123:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):180:192 -> a
-    124:124:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):190:190 -> a
+    111:111:void lambda$ensureProgramEnumConversionClass$16(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):174:174 -> a
+    112:124:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):180:192 -> a
+    125:125:com.android.tools.r8.graph.DexClass ensureEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):190:190 -> a
+    126:126:void lambda$ensureEnumConversionClass$17(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):194:194 -> a
     com.android.tools.r8.graph.Code lambda$buildEnumMethodsWithoutCode$12(com.android.tools.r8.graph.DexMethod) -> b
     1:1:void lambda$buildEnumMethodsWithCode$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.Iterable,com.android.tools.r8.synthesis.SyntheticMethodBuilder):79:79 -> b
     2:8:com.android.tools.r8.graph.Code lambda$buildEnumMethodsWithCode$2(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):84:90 -> b
     9:9:void lambda$buildEnumMethodsWithCode$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):103:103 -> b
     10:12:com.android.tools.r8.graph.Code lambda$buildEnumMethodsWithCode$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):108:110 -> b
     13:13:void lambda$buildEnumMethodsWithoutCode$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):126:126 -> b
-    14:14:void lambda$ensureProgramEnumConversionClass$16(java.lang.Iterable,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):174:174 -> b
-    15:15:void lambda$ensureEnumConversionClass$17(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):194:194 -> b
     com.android.tools.r8.graph.Code lambda$buildEnumMethodsWithoutCode$14(com.android.tools.r8.graph.DexMethod) -> c
     1:1:void lambda$buildEnumMethodsWithoutCode$15(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):129:129 -> c
     com.android.tools.r8.graph.Code lambda$buildEnumMethodsWithoutCode$8(com.android.tools.r8.graph.DexMethod) -> d
     1:1:void lambda$buildEnumMethodsWithoutCode$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticMethodBuilder):120:120 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.Xf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.Sf:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer enumConverter -> c
@@ -59437,11 +59193,11 @@
     35:35:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):125 -> a
     17:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):204:215 -> a
     17:28:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):125 -> a
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):215 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):125 -> a
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):215 -> a
     30:30:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):125 -> a
     31:31:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):218:218 -> a
@@ -59459,20 +59215,20 @@
     78:78:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     78:78:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):233 -> a
     79:79:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):233:233 -> a
-    80:80:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    80:80:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     80:80:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):233 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     81:81:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):233 -> a
     82:83:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):233:234 -> a
     84:85:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):263:264 -> a
     86:86:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):299:299 -> a
     86:86:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):265 -> a
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    87:87:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     87:87:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):299 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     87:87:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):265 -> a
-    88:88:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    88:88:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     88:88:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):299 -> a
     88:88:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):265 -> a
     89:90:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):299:300 -> a
@@ -59511,10 +59267,10 @@
     142:142:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):577:577 -> a
     142:142: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):383 -> a
     143:143: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.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):335:335 -> a
-    144:144:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    144:144:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     144:144: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.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):335 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    145:145:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    145:145:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     145:145: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.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):335 -> a
     146:150: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.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):335:339 -> a
     151:151: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):343:343 -> a
@@ -59551,11 +59307,11 @@
     253:262:void lambda$synthesizeClasses$10(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):582:591 -> a
     263:266:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):603:606 -> a
     263:266:void lambda$synthesizeClasses$10(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):592 -> a
-    267:267:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    267:267:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     267:267:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):606 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     267:267:void lambda$synthesizeClasses$10(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):592 -> a
-    268:268:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    268:268:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     268:268:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):606 -> a
     268:268:void lambda$synthesizeClasses$10(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):592 -> a
     269:271:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):606:608 -> a
@@ -59585,11 +59341,11 @@
     3:9: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):155:161 -> b
     10:10:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):299:299 -> b
     10:10: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):163 -> b
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> b
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> b
     11:11:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):299 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11: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):163 -> b
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> b
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> b
     12:12:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):299 -> b
     12:12: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):163 -> b
     13:14:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):299:300 -> b
@@ -59614,22 +59370,22 @@
     26:26:java.util.Collection lambda$ensureWrappers$1(com.android.tools.r8.graph.DexClass,java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField):290:290 -> b
     27:27:void lambda$buildWrapper$8(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.synthesis.SyntheticMethodBuilder):434:434 -> b
     1:14:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField):497:510 -> c
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> c
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> c
     15:15:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField):510 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> c
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> c
     16:16:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField):510 -> c
     17:21:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField):510:514 -> c
     22:34:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField):513:525 -> c
     1:18:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField):456:473 -> d
     19:39:java.util.Collection synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,java.lang.Iterable,com.android.tools.r8.graph.DexEncodedField):470:490 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.Rf:
     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):247:249 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getConversion():253:253 -> a
     1:1:com.android.tools.r8.graph.DexMethod getVivifiedConversion():257:257 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.Yf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.Tf:
     void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> b
     void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> c
 com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.AbstractMethodParser -> com.android.tools.r8.internal.C0:
@@ -59671,28 +59427,29 @@
     void holderType(com.android.tools.r8.graph.DexType) -> b
     void methodStart() -> b
     void returnType(com.android.tools.r8.graph.DexType) -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.Wm:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.Sm:
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags topLevelFlags -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags rewritingFlags -> c
     boolean libraryCompilation -> a
-    1:4:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,boolean):26:29 -> <init>
-    1:1:java.lang.String getJsonSource():85:85 -> a
-    2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Timing):95:95 -> a
-    3:4:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,com.android.tools.r8.utils.Timing,java.nio.file.Path):102:103 -> a
-    1:1:boolean isLibraryCompilation():58:58 -> b
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():53:53 -> c
-    1:1:java.util.List getExtraKeepRules():80:80 -> d
-    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():63:63 -> e
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification empty():33:33 -> f
-    2:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags.empty():44:45 -> f
-    2:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification empty():34 -> f
-    4:14:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags.empty():60:70 -> f
-    4:14:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification empty():34 -> f
-    15:15:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification empty():34:34 -> f
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags getRewritingFlags():71:71 -> g
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags getTopLevelFlags():67:67 -> h
-    1:1:boolean isEmpty():39:39 -> isEmpty
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Xm:
+    1:4:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,boolean):32:35 -> <init>
+    1:1:java.lang.String getJsonSource():146:146 -> a
+    2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):156:156 -> a
+    3:3:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification.isLibraryCompilation():64:64 -> a
+    3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):159 -> a
+    4:5:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):159:160 -> a
+    6:6:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):157:157 -> a
+    7:7:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,java.nio.file.Path):167:167 -> a
+    8:8:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification.isLibraryCompilation():64:64 -> a
+    8:8:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,java.nio.file.Path):168 -> a
+    9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,java.nio.file.Path):168:168 -> a
+    1:1:boolean isLibraryCompilation():64:64 -> b
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():59:59 -> c
+    1:1:java.util.List getExtraKeepRules():141:141 -> d
+    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():69:69 -> e
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags getRewritingFlags():77:77 -> f
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags getTopLevelFlags():73:73 -> g
+    1:1:boolean isEmpty():40:40 -> isEmpty
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Tm:
     com.android.tools.r8.com.google.gson.JsonObject jsonConfig -> g
     com.android.tools.r8.origin.Origin origin -> f
     int minAPILevel -> e
@@ -59706,55 +59463,55 @@
     void lambda$parse$1(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder) -> a
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags.builder():54:54 -> a
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):170 -> a
-    2:20:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):172:190 -> a
-    21:27:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):189:195 -> a
-    28:47:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):194:213 -> a
-    48:48:com.android.tools.r8.com.google.gson.JsonObject getJsonConfig():88:88 -> a
-    49:55:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):97:103 -> a
-    56:56:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
-    57:57:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":156,"2":157,"3":158,"4":159,"5":160,"6":161}}
+    2:18:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):172:188 -> a
+    19:25:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):187:193 -> a
+    26:45:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags parseTopLevelFlags(java.lang.String,java.util.function.Consumer):192:211 -> a
+    46:46:com.android.tools.r8.com.google.gson.JsonObject getJsonConfig():88:88 -> a
+    47:53:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):97:103 -> a
+    54:54:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
+    55:55:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":154,"2":155,"3":156,"4":157,"5":158,"6":159}}
+    154:154:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
+    155:155:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
     156:156:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
     157:157:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
     158:158:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
     159:159:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
-    160:160:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
-    161:161:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
-    155:155:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
-    162:162:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject):113:113 -> a
-    163:169:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):121:127 -> a
-    170:174:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():157:161 -> a
-    170:174:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
-    175:179:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):217:221 -> a
-    175:179:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():161 -> a
-    175:179:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
-    180:180:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():163:163 -> a
-    180:180:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
-    181:185:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):217:221 -> a
-    181:185:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():162 -> a
-    181:185:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
-    186:186:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():165:165 -> a
-    186:186:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
-    187:190:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):131:134 -> a
-    191:192:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.setOrigin(com.android.tools.r8.StringResource):152:153 -> a
-    191:192:java.lang.String parseJson(com.android.tools.r8.StringResource):139 -> a
-    193:197:java.lang.String parseJson(com.android.tools.r8.StringResource):142:146 -> a
-    198:210:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):227:239 -> a
-    211:220:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):238:247 -> a
-    221:222:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseMethod(java.lang.String):302:303 -> a
-    221:222:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):247 -> a
-    223:223:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):248:248 -> a
-    224:234:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):246:256 -> a
-    235:245:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):254:264 -> a
-    246:256:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):262:272 -> a
-    257:270:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):270:283 -> a
-    271:272:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseMethod(java.lang.String):302:303 -> a
-    271:272:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):283 -> a
-    273:286:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):283:296 -> a
-    287:287:com.android.tools.r8.graph.DexType stringDescriptorToDexType(java.lang.String):307:307 -> a
+    153:153:com.android.tools.r8.com.google.gson.JsonElement required(com.android.tools.r8.com.google.gson.JsonObject,java.lang.String):98:98 -> a
+    160:160:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject):113:113 -> a
+    161:167:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):121:127 -> a
+    168:172:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():157:161 -> a
+    168:172:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
+    173:177:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):215:219 -> a
+    173:177:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():161 -> a
+    173:177:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
+    178:178:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():163:163 -> a
+    178:178:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
+    179:183:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):215:219 -> a
+    179:183:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():162 -> a
+    179:183:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
+    184:184:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseRewritingFlags():165:165 -> a
+    184:184:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):129 -> a
+    185:188:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification parse(com.android.tools.r8.origin.Origin,java.lang.String,com.android.tools.r8.com.google.gson.JsonObject,java.util.function.Consumer):131:134 -> a
+    189:190:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.setOrigin(com.android.tools.r8.StringResource):152:153 -> a
+    189:190:java.lang.String parseJson(com.android.tools.r8.StringResource):139 -> a
+    191:195:java.lang.String parseJson(com.android.tools.r8.StringResource):142:146 -> a
+    196:208:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):225:237 -> a
+    209:218:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):236:245 -> a
+    219:220:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseMethod(java.lang.String):300:301 -> a
+    219:220:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):245 -> a
+    221:221:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):246:246 -> a
+    222:232:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):244:254 -> a
+    233:243:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):252:262 -> a
+    244:254:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):260:270 -> a
+    255:268:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):268:281 -> a
+    269:270:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser.parseMethod(java.lang.String):300:301 -> a
+    269:270:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):281 -> a
+    271:284:void parseFlags(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):281:294 -> a
+    285:285:com.android.tools.r8.graph.DexType stringDescriptorToDexType(java.lang.String):305:305 -> a
     1:2:com.android.tools.r8.origin.Origin getOrigin():92:93 -> b
     1:1:com.android.tools.r8.utils.Reporter reporter():84:84 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanMethodParser -> com.android.tools.r8.internal.Ym:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanMethodParser -> com.android.tools.r8.internal.Um:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString methodName -> f
     com.android.tools.r8.graph.DexMethod method -> h
@@ -59775,7 +59532,7 @@
     3:4:void returnType(com.android.tools.r8.graph.DexType):84:85 -> c
     1:2:com.android.tools.r8.graph.DexMethod getMethod():37:38 -> d
     1:1:boolean parsingFinished():33:33 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags -> com.android.tools.r8.internal.an:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags -> com.android.tools.r8.internal.Wm:
     java.util.Map rewritePrefix -> a
     java.util.Set dontRewriteInvocation -> g
     java.util.Map rewriteDerivedPrefix -> b
@@ -59802,7 +59559,7 @@
     1:1:java.util.Map getRewritePrefix():94:94 -> i
     1:1:java.util.Set getWrapperConversions():126:126 -> j
     1:4:boolean isEmpty():134:137 -> k
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder -> com.android.tools.r8.internal.Zm:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder -> com.android.tools.r8.internal.Vm:
     java.util.Map rewritePrefix -> c
     java.util.Set dontRewriteInvocation -> i
     java.util.Map rewriteDerivedPrefix -> d
@@ -59838,7 +59595,7 @@
     325:325:void validate():317:317 -> b
     326:326:void validate():313:313 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putLegacyBackport(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):272:272 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags -> com.android.tools.r8.internal.hn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags -> com.android.tools.r8.internal.dn:
     java.util.List extraKeepRules -> f
     boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
@@ -59853,7 +59610,7 @@
     1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationAPILevel():58:58 -> e
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():62:62 -> f
     1:1:boolean supportAllCallbacksFromLibrary():74:74 -> g
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder -> com.android.tools.r8.internal.gn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder -> com.android.tools.r8.internal.cn:
     java.lang.Boolean supportAllCallbacksFromLibrary -> e
     java.util.List extraKeepRules -> f
     boolean $assertionsDisabled -> g
@@ -59872,7 +59629,7 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setJsonSource(java.lang.String):108:108 -> b
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):114:114 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):98:98 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.DF:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.wF:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags topLevelFlags -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap commonFlags -> c
@@ -59887,7 +59644,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap getProgramFlags():49:49 -> f
     1:1:java.util.Map getProgramFlagsForTesting():61:61 -> g
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags getTopLevelFlags():37:37 -> h
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationFlagDeduplicator -> com.android.tools.r8.internal.EF:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationFlagDeduplicator -> com.android.tools.r8.internal.xF:
     1:6:void deduplicateFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.utils.Reporter):26:31 -> a
     7:7:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():57:57 -> a
     7:7:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> a
@@ -59924,7 +59681,7 @@
     56:62:void deduplicateFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):119:125 -> b
     1:2:void deduplicateRewriteDifferentPrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):152:153 -> c
     1:2:void deduplicateRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):179:180 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.GF:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.zF:
     1:1:void <init>():48:48 -> <init>
     1:1:void export(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):52:52 -> a
     2:7:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter.internalExport(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):58:63 -> a
@@ -59971,30 +59728,42 @@
     109:109:java.util.Set setToString(java.util.Set):138 -> a
     110:110:java.util.Set setToString(java.util.Set):139:139 -> a
     1:2:java.util.Map mapToString(java.util.Map):144:145 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.FF:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.yF:
     1:1:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter):79:79 -> <init>
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.HF:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.AF:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):20:20 -> <init>
     void lambda$parseMultiLevelConfiguration$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder) -> b
     1:10:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):26:35 -> b
     11:21:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):39:49 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.YA:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.RA:
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags rewritingFlags -> c
     boolean libraryCompilation -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags topLevelFlags -> b
-    1:4:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,boolean):34:37 -> <init>
-    1:1:java.lang.String getJsonSource():117:117 -> a
-    2:4:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.Timing):123:125 -> a
-    5:7:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,com.android.tools.r8.utils.Timing,java.nio.file.Path):132:134 -> a
-    1:1:boolean isLibraryCompilation():69:69 -> b
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():64:64 -> c
-    1:1:java.util.List getExtraKeepRules():112:112 -> d
-    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():74:74 -> e
-    1:1:java.util.Map getCustomConversions():102:102 -> f
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags getRewritingFlags():55:55 -> g
-    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags getTopLevelFlags():51:51 -> h
-    1:1:boolean isEmpty():42:42 -> isEmpty
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.ZA:
+    1:4:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,boolean):39:42 -> <init>
+    1:1:java.lang.String getJsonSource():154:154 -> a
+    2:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):160:161 -> a
+    4:8:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.util.List,com.android.tools.r8.utils.InternalOptions):98:102 -> a
+    4:8:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):161 -> a
+    9:9:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):162:162 -> a
+    10:10:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,java.nio.file.Path):168:168 -> a
+    11:12:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):108:109 -> a
+    11:12:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,java.nio.file.Path):169 -> a
+    13:13:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.utils.InternalOptions,java.nio.file.Path,java.nio.file.Path):170:170 -> a
+    1:1:boolean isLibraryCompilation():79:79 -> b
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel():74:74 -> c
+    1:1:java.util.List getExtraKeepRules():149:149 -> d
+    1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():84:84 -> e
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification empty():32:32 -> f
+    2:8:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags.empty():47:53 -> f
+    2:8:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification empty():33 -> f
+    9:17:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags.empty():60:68 -> f
+    9:17:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification empty():33 -> f
+    18:18:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification empty():33:33 -> f
+    1:1:java.util.Map getCustomConversions():132:132 -> g
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags getRewritingFlags():65:65 -> h
+    1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags getTopLevelFlags():61:61 -> i
+    1:1:boolean isEmpty():47:47 -> isEmpty
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.SA:
     com.android.tools.r8.com.google.gson.JsonObject jsonConfig -> f
     com.android.tools.r8.utils.SemanticVersion MIN_SUPPORTED_VERSION -> g
     com.android.tools.r8.origin.Origin origin -> e
@@ -60049,7 +59818,7 @@
     4:8:java.lang.String parseJson(com.android.tools.r8.StringResource):138:142 -> b
     1:2:com.android.tools.r8.origin.Origin getOrigin():88:89 -> c
     1:1:com.android.tools.r8.utils.Reporter reporter():80:80 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.aB:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.TA:
     java.util.Map rewritePrefix -> a
     java.util.Set dontRetargetLibMember -> g
     java.util.Map emulateLibraryInterface -> b
@@ -60072,7 +59841,7 @@
     1:1:java.util.Map getRewritePrefix():91:91 -> g
     1:1:java.util.Set getWrapperConversions():119:119 -> h
     1:3:boolean isEmpty():123:125 -> i
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder -> com.android.tools.r8.internal.aB$a:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder -> com.android.tools.r8.internal.TA$a:
     java.util.Map rewritePrefix -> d
     java.util.Set dontRetargetLibMember -> j
     com.android.tools.r8.origin.Origin origin -> c
@@ -60136,7 +59905,7 @@
     14:14:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):240 -> d
     15:15:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):290:290 -> d
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRewritePrefix(java.lang.String,java.lang.String):202:202 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.dB:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.WA:
     java.util.List extraKeepRules -> f
     boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
@@ -60151,7 +59920,7 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():75:75 -> e
     1:1:boolean supportAllCallbacksFromLibrary():87:87 -> f
     1:7:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags testing():57:63 -> g
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder -> com.android.tools.r8.internal.cB:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder -> com.android.tools.r8.internal.VA:
     java.util.List extraKeepRules -> f
     boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
@@ -60169,7 +59938,7 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setJsonSource(java.lang.String):122:122 -> b
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):128:128 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):112:112 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.IF:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.BF:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap commonFlags -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap libraryFlags -> d
@@ -60181,12 +59950,12 @@
     1:1:com.android.tools.r8.origin.Origin getOrigin():32:32 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap getProgramFlags():48:48 -> d
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags getTopLevelFlags():36:36 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.JF:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.CF:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):20:20 -> <init>
     1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):39:51 -> a
     void lambda$parseMultiLevelConfiguration$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder) -> c
     1:10:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):26:35 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor -> com.android.tools.r8.internal.Xd:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor -> com.android.tools.r8.internal.Wd:
     com.android.tools.r8.graph.DexMethod from -> b
     com.android.tools.r8.graph.DexMethod to -> a
     boolean $assertionsDisabled -> c
@@ -60194,7 +59963,7 @@
     1:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):13:17 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getFrom():25:25 -> a
     1:1:com.android.tools.r8.graph.DexMethod getTo():21:21 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod -> com.android.tools.r8.internal.mf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod -> com.android.tools.r8.internal.hf:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind holderKind -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):28:30 -> <init>
@@ -60203,7 +59972,7 @@
     1:1:com.android.tools.r8.graph.DexMethod getMethod():42:42 -> c
     1:1:com.android.tools.r8.graph.DexString getName():46:46 -> d
     1:1:com.android.tools.r8.graph.DexProto getProto():50:50 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor -> com.android.tools.r8.internal.bi:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor -> com.android.tools.r8.internal.Wh:
     java.util.LinkedHashMap dispatchCases -> d
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod emulatedDispatchMethod -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod interfaceMethod -> a
@@ -60213,13 +59982,13 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getEmulatedDispatchMethod():60:60 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getForwardingMethod():64:64 -> c
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getInterfaceMethod():56:56 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor -> com.android.tools.r8.internal.di:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor -> com.android.tools.r8.internal.Yh:
     java.util.Map emulatedMethods -> b
     com.android.tools.r8.graph.DexType rewrittenType -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.util.Map):16:18 -> <init>
     1:1:java.util.Map getEmulatedMethods():26:26 -> a
     1:1:com.android.tools.r8.graph.DexType getRewrittenType():22:22 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.eD:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.XC:
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags rewritingFlags -> c
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags topLevelFlags -> b
     boolean libraryCompilation -> a
@@ -60272,10 +60041,10 @@
     1:1:boolean hasRetargeting():144:144 -> r
     1:1:boolean isLibraryCompilation():51:51 -> s
     1:1:boolean supportAllCallbacksFromLibrary():71:71 -> t
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.dD:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.WC:
     1:1:void <init>(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):25:25 -> <init>
     boolean isSupported(com.android.tools.r8.graph.DexReference) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags -> com.android.tools.r8.internal.gD:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags -> com.android.tools.r8.internal.ZC:
     java.util.Map rewriteType -> a
     java.util.Map rewriteDerivedTypeOnly -> b
     java.util.Map staticRetarget -> c
@@ -60314,7 +60083,7 @@
     1:1:java.util.Map getWrappers():122:122 -> m
     1:1:boolean hasEmulatedInterfaces():161:161 -> n
     1:3:boolean hasRetargeting():150:152 -> o
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder -> com.android.tools.r8.internal.fD:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder -> com.android.tools.r8.internal.YC:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder dontRetarget -> j
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder amendLibraryMethod -> l
@@ -60344,7 +60113,7 @@
     3:3:com.android.tools.r8.graph.DexType getRewrittenType(com.android.tools.r8.graph.DexType):249:249 -> b
     1:5:void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):197:201 -> c
     6:6:void putStaticRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):209:209 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags -> com.android.tools.r8.internal.hD:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags -> com.android.tools.r8.internal.aD:
     java.lang.String identifier -> c
     java.lang.String synthesizedLibraryClassesPackagePrefix -> b
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
@@ -60354,7 +60123,7 @@
     1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationAPILevel():48:48 -> b
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():52:52 -> c
     1:1:boolean supportAllCallbacksFromLibrary():64:64 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.Of:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.Jf:
     java.util.Map staticRetarget -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map nonEmulatedVirtualRetarget -> d
@@ -60385,7 +60154,7 @@
     31:31: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):624:624 -> b
     31:31:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):157 -> b
     32:33:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult computeNewInvokeTarget(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):159:160 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.Nf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.If:
     boolean hasNewInvokeTarget -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult NO_REWRITING -> c
     java.util.function.Function newInvokeTargetSupplier -> b
@@ -60399,21 +60168,21 @@
     3:3:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121 -> a
     4:5:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):121:122 -> a
     com.android.tools.r8.graph.DexMethod lambda$static$0(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer) -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.Pf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.Kf:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):30:32 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView):19:19 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView):19 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView):19 -> a
     4:12:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView):19:27 -> a
     13:17:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):37:41 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.Qf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.Lf:
     java.util.Map emulatedDispatchMethods -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
@@ -60421,17 +60190,17 @@
     1:1:void <clinit>():33:33 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView):39: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():446:446 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     2:2:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     3:3:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52 -> a
     4:5:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:53 -> a
     6:6:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     7:7:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     8:8:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
     9:9:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
     10:10:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():431:431 -> a
@@ -60493,9 +60262,9 @@
     93:95:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):80 -> a
     96:97:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):142:143 -> a
     96:97:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):80 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.Rf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.Mf:
     void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.Sf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.Nf:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():25:25 -> <clinit>
@@ -60513,10 +60282,10 @@
     35:36:com.android.tools.r8.graph.DexMethod emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):87 -> a
     37:37:com.android.tools.r8.graph.DexMethod emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):88:88 -> a
     38:43:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):95:100 -> a
-    44:44:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    44:44:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     44:44:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    45:45:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     45:45:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):100 -> a
     46:50:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):101:105 -> a
     51:74:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):104:127 -> a
@@ -60524,10 +60293,10 @@
     76:76:void lambda$ensureProgramEmulatedHolderDispatchMethod$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):146:146 -> a
     77:77:void lambda$ensureEmulatedInterfaceDispatchMethod$4(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):169:169 -> a
     78:78:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):176:176 -> a
-    79:79:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    79:79:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     79:79:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):176 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:80:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    80:80:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     80:80:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):176 -> a
     81:88:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):176:183 -> a
     89:89:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):182:182 -> a
@@ -60541,10 +60310,10 @@
     106:106:void lambda$buildHolderDispatchMethod$8(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):221:221 -> a
     107:115:void lambda$buildHolderDispatchMethod$8(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):220:228 -> a
     116:116:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$7(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):230:230 -> a
-    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     117:117:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$7(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):230 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    118:118:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     118:118:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$7(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):230 -> a
     119:120:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.forwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):63:64 -> a
     119:120:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.ensureForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):70 -> a
@@ -60566,32 +60335,21 @@
     127:130:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.generateEmulatedDispatchCfCode(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):244:247 -> a
     127:130:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$7(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):231 -> a
     1:2:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):134:135 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> b
     3:3:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):135 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> b
     4:4:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):135 -> b
     5:13:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):135:143 -> b
     14:14:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):142:142 -> b
     15:18:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):153:156 -> b
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> b
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> b
     19:19:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):156 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> b
+    20:20:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> b
     20:20:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):156 -> b
     21:29:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):157:165 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.AppForSpecConversion -> com.android.tools.r8.internal.n2:
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:13:com.android.tools.r8.graph.DexApplication readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.utils.Timing):23:35 -> a
-    14:21:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.AppForSpecConversion.internalReadApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):61:68 -> a
-    14:21:com.android.tools.r8.graph.DexApplication readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.utils.Timing):35 -> a
-    22:22:com.android.tools.r8.graph.DexApplication readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.utils.Timing):36:36 -> a
-    23:29:com.android.tools.r8.graph.DexApplication readAppForTesting(java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.utils.Timing):47:53 -> a
-    30:37:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.AppForSpecConversion.internalReadApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):61:68 -> a
-    30:37:com.android.tools.r8.graph.DexApplication readAppForTesting(java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.utils.Timing):54 -> a
-    38:38:com.android.tools.r8.graph.DexApplication readAppForTesting(java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.utils.Timing):55:55 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter -> com.android.tools.r8.internal.bn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter -> com.android.tools.r8.internal.Xm:
     java.util.Map emulatedInterfaceHierarchy -> b
     java.util.Set missingEmulatedInterface -> c
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
@@ -60636,7 +60394,7 @@
     63:63:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):101:101 -> a
     63:63:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):82 -> a
     63:63:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClassAndMethod):61 -> a
-    64:64:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2644:2644 -> a
+    64:64:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2642:2642 -> a
     64:64:java.util.LinkedHashMap com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.getDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod):101 -> a
     64:64:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter.computeEmulatedDispatchDescriptor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy):82 -> a
     64:64:void lambda$convertEmulatedInterfaces$1(java.util.Map,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClassAndMethod):61 -> a
@@ -60660,255 +60418,226 @@
     110:116:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):173:179 -> a
     117:118:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
     117:118:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):179 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter -> com.android.tools.r8.internal.cn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter -> com.android.tools.r8.internal.Ym:
     java.util.Map descriptorPrefix -> d
     java.util.Set usedPrefix -> f
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
     java.lang.String synthesizedPrefix -> c
     java.util.Map descriptorDifferentPrefix -> e
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder builder -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):33:33 -> <init>
-    2:14:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):27:39 -> <init>
-    1:2:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):44:45 -> a
-    3:3:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):84:84 -> a
-    3:3:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):45 -> a
-    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137:137 -> a
-    4:4:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    4:4:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    4:4:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):45 -> a
-    5:6:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):127:128 -> a
-    5:6:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137 -> a
-    5:6:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    5:6:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    5:6:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):45 -> a
-    7:7:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    7:7:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):129 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137 -> a
-    7:7:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    7:7:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    7:7:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):45 -> a
-    8:10:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):141:143 -> a
-    8:10:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    8:10:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    8:10:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):45 -> a
-    11:14:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):142:145 -> a
-    11:14:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    11:14:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    11:14:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):45 -> a
-    15:15:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):102:102 -> a
-    15:15:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    15:15:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):45 -> a
-    16:16:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46:46 -> a
-    17:17:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):84:84 -> a
-    17:17:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46 -> a
-    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137:137 -> a
-    18:18:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    18:18:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    18:18:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46 -> a
-    19:20:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):127:128 -> a
-    19:20:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137 -> a
-    19:20:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    19:20:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    19:20:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46 -> a
-    21:21:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    21:21:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):129 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137 -> a
-    21:21:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    21:21:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    21:21:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46 -> a
-    22:24:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):141:143 -> a
-    22:24:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    22:24:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    22:24:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46 -> a
-    25:28:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):142:145 -> a
-    25:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    25:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    25:28:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46 -> a
-    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):102:102 -> a
-    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85 -> a
-    29:29:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46 -> a
-    30:31:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):47:48 -> a
-    32:33:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):72:73 -> a
-    32:33:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    34:38:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):61:65 -> a
-    34:38:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):73 -> a
-    34:38:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    39:39:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":49,"2":50,"3":51}}
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):65:65 -> a
-    49:49:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):73 -> a
-    49:49:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):65:65 -> a
-    50:50:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):73 -> a
-    50:50:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):65:65 -> a
-    51:51:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):73 -> a
-    51:51:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):68:68 -> a
-    40:40:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):73 -> a
-    40:40:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):67:67 -> a
-    41:41:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):73 -> a
-    41:41:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    42:42:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):66:66 -> a
-    42:42:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):73 -> a
-    42:42:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    43:43:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):74:74 -> a
-    43:43:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48 -> a
-    44:48:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.warnIfUnusedPrefix(java.util.function.BiConsumer):53:57 -> a
-    44:48:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
-    52:53:void rewriteClasses():90:91 -> a
-    54:60:void lambda$registerDifferentType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):115:121 -> a
-    61:61:void lambda$registerDifferentType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):119:119 -> a
-    62:62:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137:137 -> a
-    62:62:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    62:62:void registerClassType(com.android.tools.r8.graph.DexType):95 -> a
-    63:64:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):127:128 -> a
-    63:64:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137 -> a
-    63:64:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    63:64:void registerClassType(com.android.tools.r8.graph.DexType):95 -> a
-    65:65:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    65:65:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):129 -> a
-    65:65:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):137 -> a
-    65:65:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    65:65:void registerClassType(com.android.tools.r8.graph.DexType):95 -> a
-    66:68:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):141:143 -> a
-    66:68:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    66:68:void registerClassType(com.android.tools.r8.graph.DexType):95 -> a
-    69:72:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):142:145 -> a
-    69:72:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):100 -> a
-    69:72:void registerClassType(com.android.tools.r8.graph.DexType):95 -> a
-    73:73:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):102:102 -> a
-    73:73:void registerClassType(com.android.tools.r8.graph.DexType):95 -> a
-    74:74:void registerClassType(com.android.tools.r8.graph.DexType):96:96 -> a
-    75:76:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):150:151 -> a
-    77:78:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):167:168 -> a
-    77:78:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):152 -> a
-    79:79:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":84,"2":85,"3":86}}
-    84:84:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> a
-    84:84:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):152 -> a
-    85:85:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> a
-    85:85:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):152 -> a
-    86:86:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> a
-    86:86:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):152 -> a
-    80:80:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):169:169 -> a
-    80:80:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):152 -> a
-    81:83:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):152:154 -> a
-    1:1:void registerDifferentType(com.android.tools.r8.graph.DexType):107:107 -> b
-    2:4:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):127:129 -> b
-    2:4:void registerDifferentType(com.android.tools.r8.graph.DexType):107 -> b
-    5:5:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
-    5:5:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):129 -> b
-    5:5:void registerDifferentType(com.android.tools.r8.graph.DexType):107 -> b
-    6:18:void registerDifferentType(com.android.tools.r8.graph.DexType):111:123 -> b
-    19:20:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):159:160 -> b
-    21:22:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):167:168 -> b
-    21:22:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":33,"2":34,"3":35}}
-    33:33:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> b
-    33:33:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    34:34:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> b
-    34:34:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    35:35:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> b
-    35:35:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    24:24:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):169:169 -> b
-    24:24:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    25:25:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161:161 -> b
-    26:27:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):167:168 -> b
-    26:27:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    28:28:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):0:0 -> b
+    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):34:34 -> <init>
+    2:14:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):28:40 -> <init>
+    1:10:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteClasses():91:100 -> a
+    1:10:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):45 -> a
+    11:11:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46:46 -> a
+    12:13:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85:86 -> a
+    12:13:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):46 -> a
+    14:14:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):47:47 -> a
+    15:16:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteValues(java.util.Map):85:86 -> a
+    15:16:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):47 -> a
+    17:18:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):48:49 -> a
+    19:20:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):73:74 -> a
+    19:20:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    21:25:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):62:66 -> a
+    21:25:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):74 -> a
+    21:25:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    26:26:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":36,"2":37,"3":38}}
-    36:36:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> b
-    36:36:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    37:37:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> b
-    37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    38:38:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):168:168 -> b
-    38:38:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    29:29:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):169:169 -> b
-    29:29:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161 -> b
-    30:32:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):161:163 -> b
-    1:1:void rewriteEmulatedInterface(java.util.Map):79:79 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter -> com.android.tools.r8.internal.dn:
+    36:36:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):66:66 -> a
+    36:36:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):74 -> a
+    36:36:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    37:37:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):66:66 -> a
+    37:37:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):74 -> a
+    37:37:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    38:38:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):66:66 -> a
+    38:38:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):74 -> a
+    38:38:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):69:69 -> a
+    27:27:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):74 -> a
+    27:27:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):68:68 -> a
+    28:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):74 -> a
+    28:28:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.convertJavaNameToDesugaredLibrary(com.android.tools.r8.graph.DexType):67:67 -> a
+    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):74 -> a
+    29:29:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewriteRetargetKeys(java.util.Map):75:75 -> a
+    30:30:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):49 -> a
+    31:35:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.warnIfUnusedPrefix(java.util.function.BiConsumer):54:58 -> a
+    31:35:void convertPrefixFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,java.util.function.BiConsumer):50 -> a
+    39:39:void registerDifferentType(com.android.tools.r8.graph.DexType):112:112 -> a
+    40:42:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):132:134 -> a
+    40:42:void registerDifferentType(com.android.tools.r8.graph.DexType):112 -> a
+    43:43:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    43:43:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):134 -> a
+    43:43:void registerDifferentType(com.android.tools.r8.graph.DexType):112 -> a
+    44:56:void registerDifferentType(com.android.tools.r8.graph.DexType):116:128 -> a
+    57:63:void lambda$registerDifferentType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):120:126 -> a
+    64:64:void lambda$registerDifferentType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):124:124 -> a
+    65:66:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):155:156 -> a
+    67:68:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):172:173 -> a
+    67:68:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):157 -> a
+    69:69:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76}}
+    74:74:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> a
+    74:74:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):157 -> a
+    75:75:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> a
+    75:75:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):157 -> a
+    76:76:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> a
+    76:76:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):157 -> a
+    70:70:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):174:174 -> a
+    70:70:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):157 -> a
+    71:73:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewriteDifferentPrefix(java.util.Map):157:159 -> a
+    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):142:142 -> b
+    1:1:void registerType(com.android.tools.r8.graph.DexType):105 -> b
+    2:3:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):132:133 -> b
+    2:3:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):142 -> b
+    2:3:void registerType(com.android.tools.r8.graph.DexType):105 -> b
+    4:4:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
+    4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):134 -> b
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):142 -> b
+    4:4:void registerType(com.android.tools.r8.graph.DexType):105 -> b
+    5:7:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):146:148 -> b
+    5:7:void registerType(com.android.tools.r8.graph.DexType):105 -> b
+    8:11:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):147:150 -> b
+    8:11:void registerType(com.android.tools.r8.graph.DexType):105 -> b
+    12:12:void registerType(com.android.tools.r8.graph.DexType):107:107 -> b
+    13:14:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):164:165 -> b
+    15:16:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):172:173 -> b
+    15:16:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    17:17:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":27,"2":28,"3":29}}
+    27:27:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> b
+    27:27:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    28:28:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> b
+    28:28:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    29:29:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> b
+    29:29:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    18:18:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):174:174 -> b
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    19:19:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166:166 -> b
+    20:21:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):172:173 -> b
+    20:21:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    22:22:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":30,"2":31,"3":32}}
+    30:30:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> b
+    30:30:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    31:31:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> b
+    31:31:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    32:32:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):173:173 -> b
+    32:32:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    23:23:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.toDescriptorPrefix(java.lang.String):174:174 -> b
+    23:23:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166 -> b
+    24:26:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):166:168 -> b
+    1:1:void rewriteEmulatedInterface(java.util.Map):80:80 -> c
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter -> com.android.tools.r8.internal.Zm:
+    java.util.Set missingMethods -> c
+    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> b
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
-    java.util.Set missingMethods -> b
-    boolean $assertionsDisabled -> c
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):31:31 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):29:32 -> <init>
-    1:5:void convertRetargetFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):40:44 -> a
-    6:13:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):52:59 -> a
-    6:13:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
+    boolean $assertionsDisabled -> d
+    1:1:void <clinit>():28:28 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):34:34 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.AppInfoWithClassHierarchy):32:36 -> <init>
+    1:5:void convertRetargetFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):44:48 -> a
+    6:13:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):56:63 -> a
+    6:13:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
     14:14:boolean com.android.tools.r8.graph.DexClass.isFinal():672:672 -> a
-    14:14:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):62 -> a
-    14:14:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
-    15:15:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):62:62 -> a
-    15:15:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
-    16:22:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):74:80 -> a
-    16:22:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):66 -> a
-    16:22:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
-    23:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):79:84 -> a
-    23:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):66 -> a
-    23:28:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
+    14:14:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):66 -> a
+    14:14:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    15:15:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):66:66 -> a
+    15:15:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    16:22:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):78:84 -> a
+    16:22:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    16:22:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    23:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):83:88 -> a
+    23:28:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    23:28:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
     29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod.<init>(com.android.tools.r8.graph.DexMethod):25:25 -> a
-    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):84 -> a
-    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):66 -> a
-    29:29:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
-    30:36:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):85:91 -> a
-    30:36:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):66 -> a
-    30:36:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
-    37:37:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):90:90 -> a
-    37:37:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):66 -> a
-    37:37:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
-    38:38:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):63:63 -> a
-    38:38:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):43 -> a
-    39:57:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):101:119 -> a
-    58:60:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):116:118 -> a
-    61:61:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
-    61:61:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):13 -> a
-    61:61:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):115 -> a
-    62:62:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):134:134 -> a
-    63:65:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiConsumer):127:129 -> a
-    63:65:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):134 -> a
-    66:66:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):142:142 -> a
-    67:67: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):317:317 -> a
-    67:67:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):141 -> a
+    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):88 -> a
+    29:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    29:29:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    30:35:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):89:94 -> a
+    30:35:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    30:35:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    36:42:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):103:109 -> a
+    36:42:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):94 -> a
+    36:42:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    36:42:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    43:43:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
+    43:43:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):109 -> a
+    43:43:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):94 -> a
+    43:43:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    43:43:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    44:48:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):110:114 -> a
+    44:48:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):94 -> a
+    44:48:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    44:48:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    49:49:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.validateNoOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo):109:109 -> a
+    49:49:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):94 -> a
+    49:49:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    49:49:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    50:50:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):96:96 -> a
+    50:50:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    50:50:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    51:51:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):95:95 -> a
+    51:51:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):70 -> a
+    51:51:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    52:52:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertRetargetCoreLibMemberFlag(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):67:67 -> a
+    52:52:void lambda$convertRetargetFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):47 -> a
+    53:71:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):124:142 -> a
+    72:74:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):139:141 -> a
+    75:75:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
+    75:75:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):13 -> a
+    75:75:com.android.tools.r8.utils.TraversalContinuation lambda$isEmulatedInterfaceDispatch$1(java.util.Map,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):138 -> a
+    76:76:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):166:166 -> a
+    77:83:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):151:157 -> a
+    77:83:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):166 -> a
+    84:84:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
+    84:84:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):157 -> a
+    84:84:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):166 -> a
+    85:86:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):158:159 -> a
+    85:86:void convertNonEmulatedVirtualRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):166 -> a
+    87:87:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):175:175 -> a
+    88:88: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):304:304 -> a
+    88:88:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):174 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    68:70: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):317:317 -> a
-    68:70:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):141 -> a
-    71:71:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):139:139 -> a
-    1:1:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):147:147 -> b
-    2:4:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiConsumer):127:129 -> b
-    2:4:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):147 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter -> com.android.tools.r8.internal.en:
-    java.util.Set missingCustomConversions -> c
-    com.android.tools.r8.utils.Timing timing -> d
-    com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
-    com.android.tools.r8.utils.Reporter reporter -> b
-    1:1:void <init>(com.android.tools.r8.utils.Timing):42:42 -> <init>
-    2:6:void <init>(com.android.tools.r8.utils.Timing):39:43 -> <init>
-    1:2:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):50:51 -> a
-    3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convertForTesting(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):62:62 -> a
-    4:6:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convertForTesting(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):61:63 -> a
-    7:13:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):68:74 -> a
-    14:20:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):71:77 -> a
-    21:23:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):76:78 -> a
-    24:30:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags):85:91 -> a
-    24:30:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):78 -> a
-    31:33:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication):79:81 -> a
-    34:37:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):96:99 -> a
-    38:59:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):98:119 -> a
-    60:60:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):113:113 -> a
-    61:76:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertCustomConversion(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):128:143 -> a
-    61:76:void lambda$convertRewritingFlags$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):113 -> a
-    77:78:void warnMissingDexString(java.lang.String,java.util.Set):153:154 -> a
-    79:82:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.warn(java.lang.String,java.util.List):159:162 -> a
-    79:82:void warnMissingDexString(java.lang.String,java.util.Set):155 -> a
-    1:2:void warnMissingReferences(java.lang.String,java.util.Set):147:148 -> b
-    3:6:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.warn(java.lang.String,java.util.List):159:162 -> b
-    3:6:void warnMissingReferences(java.lang.String,java.util.Set):149 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter -> com.android.tools.r8.internal.fn:
+    89:91: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):304:304 -> a
+    89:91:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):174 -> a
+    92:92:void lambda$convertNonEmulatedVirtualRetarget$2(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):172:172 -> a
+    1:1:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):180:180 -> b
+    2:8:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):151:157 -> b
+    2:8:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):180 -> b
+    9:9:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> b
+    9:9:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):157 -> b
+    9:9:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):180 -> b
+    10:11:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.SubtypingInfo,java.util.function.BiConsumer):158:159 -> b
+    10:11:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):180 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter -> com.android.tools.r8.internal.an:
+    com.android.tools.r8.graph.AppView appView -> a
+    java.util.Set missingCustomConversions -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:4:void <init>():40:43 -> <init>
+    1:11:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.util.List,java.util.List,com.android.tools.r8.utils.InternalOptions):51:61 -> a
+    12:18:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):70:76 -> a
+    19:40:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags convertRewritingFlags(java.lang.String,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):108:129 -> a
+    41:56:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertCustomConversion(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):137:152 -> a
+    41:56:void lambda$convertRewritingFlags$0(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):124 -> a
+    57:62:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):156:161 -> a
+    57:62:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):82 -> a
+    63:67:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):83:87 -> a
+    68:74:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):84:90 -> a
+    75:77:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):89:91 -> a
+    78:84:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags):97:103 -> a
+    78:84:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):91 -> a
+    85:86:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):92:93 -> a
+    87:88:void warnMissingDexString(java.lang.String,java.util.Set):172:173 -> a
+    89:92:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.warn(java.lang.String,java.util.List):178:181 -> a
+    89:92:void warnMissingDexString(java.lang.String,java.util.Set):174 -> a
+    1:2:void warnMissingReferences(java.lang.String,java.util.Set):166:167 -> b
+    3:6:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.warn(java.lang.String,java.util.List):178:181 -> b
+    3:6:void warnMissingReferences(java.lang.String,java.util.Set):168 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter -> com.android.tools.r8.internal.bn:
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
     java.util.Set missingClasses -> b
     boolean $assertionsDisabled -> c
@@ -60929,72 +60658,69 @@
     44:46:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter.allImplementedMethods(com.android.tools.r8.graph.DexClass):87:89 -> a
     44:46:void convertWrappers(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer):46 -> a
     47:51:void convertWrappers(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,java.util.function.BiConsumer) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter -> com.android.tools.r8.internal.bB:
-    com.android.tools.r8.utils.Timing timing -> a
-    com.android.tools.r8.utils.AndroidApiLevel LEGACY_HACK_LEVEL -> b
-    boolean $assertionsDisabled -> c
-    1:4:void <clinit>():47:50 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.utils.Timing):53:54 -> <init>
-    1:6:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):79:84 -> a
-    7:14:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):312:319 -> a
-    7:14:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):84 -> a
-    15:17:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):318:320 -> a
-    15:17:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):84 -> a
-    18:22:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):86:90 -> a
-    23:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):156:163 -> a
-    23:30:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):92 -> a
-    31:31:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():62:62 -> a
-    31:31:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):164 -> a
-    31:31:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):92 -> a
-    32:33:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):164:165 -> a
-    32:33:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):92 -> a
-    34:39:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):94:99 -> a
-    40:41:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):107:108 -> a
-    42:42:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convertForTesting(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):119:119 -> a
-    43:45:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convertForTesting(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):118:120 -> a
-    46:50:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):126:130 -> a
-    51:55:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):127:131 -> a
-    56:63:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):312:319 -> a
-    56:63:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):131 -> a
-    64:66:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):318:320 -> a
-    64:66:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):131 -> a
-    67:74:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):136:143 -> a
-    75:75:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():62:62 -> a
-    75:75:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):144 -> a
-    76:83:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification convert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):144:151 -> a
-    84:95:void legacyLibraryFlagHacks(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):173:184 -> a
-    96:107:void legacyLibraryFlagHacks(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):182:193 -> a
-    108:113:void legacyLibraryFlagHacks(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):191:196 -> a
-    114:115:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap convertRewritingFlagMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):201:202 -> a
-    116:116:void lambda$convertRewritingFlagMap$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin,java.lang.Integer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags):202:202 -> a
-    117:134:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):208:225 -> a
-    135:135:void lambda$convertRewritingFlags$1(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):212:212 -> a
-    136:141:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertDontRewriteInvocation(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Pair):253:258 -> a
-    136:141:void lambda$convertRewritingFlags$3(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Pair):223 -> a
-    142:142:void convertRetargetCoreLibMember(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):267:267 -> a
-    143:148:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):269:274 -> a
-    149:153:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):284:288 -> a
-    154:154:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():62:62 -> a
-    154:154:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):291 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    155:165:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):292:302 -> a
-    166:166:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":471,"2":472,"3":473}}
-    471:471:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):302:302 -> a
-    472:472:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):302:302 -> a
-    473:473:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):302:302 -> a
-    470:470:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication):304:304 -> a
-    474:474:boolean lambda$findMethodsWithName$6(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):285:285 -> a
-    1:1:void lambda$convertRewritingFlags$2(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):220:220 -> b
-    2:3:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):243:244 -> b
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter -> com.android.tools.r8.internal.UA:
+    boolean $assertionsDisabled -> b
+    com.android.tools.r8.utils.AndroidApiLevel legacyHackLevel -> a
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:4:void <init>():49:52 -> <init>
+    1:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):72:73 -> a
+    3:5:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):184:186 -> a
+    3:5:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):74 -> a
+    6:6:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):75:75 -> a
+    7:14:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):280:287 -> a
+    7:14:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):75 -> a
+    15:17:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):286:288 -> a
+    15:17:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):75 -> a
+    18:22:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):77:81 -> a
+    23:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):141:147 -> a
+    23:29:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):83 -> a
+    30:30:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
+    30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):148 -> a
+    30:30:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):83 -> a
+    31:32:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.legacyLibraryFlagHacks(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):148:149 -> a
+    31:32:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):83 -> a
+    33:36:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification convertAllAPILevels(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification,java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):85:88 -> a
+    37:48:void legacyLibraryFlagHacks(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):157:168 -> a
+    49:60:void legacyLibraryFlagHacks(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):166:177 -> a
+    61:66:void legacyLibraryFlagHacks(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):175:180 -> a
+    67:69:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.readApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):184:186 -> a
+    67:69:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):115 -> a
+    70:71:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):118:119 -> a
+    72:76:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):116:120 -> a
+    77:84:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):280:287 -> a
+    77:84:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):120 -> a
+    85:87:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertTopLevelFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags):286:288 -> a
+    85:87:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):120 -> a
+    88:94:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):125:131 -> a
+    95:95:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.DexApplication.dexItemFactory():61:61 -> a
+    95:95:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):132 -> a
+    96:100:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification internalConvert(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):132:136 -> a
+    101:102:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap convertRewritingFlagMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):191:192 -> a
+    103:103:void lambda$convertRewritingFlagMap$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin,java.lang.Integer,com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags):192:192 -> a
+    104:122:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags convertRewritingFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.origin.Origin):198:216 -> a
+    123:123:void lambda$convertRewritingFlags$1(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):202:202 -> a
+    124:128:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter.convertDontRewriteInvocation(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Pair):243:247 -> a
+    124:128:void lambda$convertRewritingFlags$3(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Pair):214 -> a
+    129:129:void convertRetargetCoreLibMember(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):256:256 -> a
+    130:134:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):258:262 -> a
+    135:137:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):268:270 -> a
+    138:138:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":411,"2":412,"3":413}}
+    411:411:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):270:270 -> a
+    412:412:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):270:270 -> a
+    413:413:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):270:270 -> a
+    410:410:java.util.List findMethodsWithName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):272:272 -> a
+    414:414:boolean lambda$findMethodsWithName$6(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):269:269 -> a
+    1:1:void lambda$convertRewritingFlags$2(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.Map):211:211 -> b
+    2:3:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):233:234 -> b
     4:4:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":249,"2":250,"3":251}}
-    249:249:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):244:244 -> b
-    250:250:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):244:244 -> b
-    251:251:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):244:244 -> b
-    248:248:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):244:244 -> b
-    1:17:void rewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):232:248 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LibraryValidator -> com.android.tools.r8.internal.BB:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":239,"2":240,"3":241}}
+    239:239:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):234:234 -> b
+    240:240:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):234:234 -> b
+    241:241:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):234:234 -> b
+    238:238:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):234:234 -> b
+    1:17:void rewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):222:238 -> c
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LibraryValidator -> com.android.tools.r8.internal.uB:
     1:12:void validate(com.android.tools.r8.graph.DexApplication,boolean,com.android.tools.r8.utils.AndroidApiLevel):25:36 -> a
     13:13:void validate(com.android.tools.r8.graph.DexApplication,boolean,com.android.tools.r8.utils.AndroidApiLevel):30:30 -> a
 com.android.tools.r8.ir.desugar.icce.AlwaysThrowingInstructionDesugaring -> com.android.tools.r8.internal.I1:
@@ -61021,7 +60747,7 @@
     55:87:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,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):142:174 -> a
     88:110:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,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):170:192 -> a
     111:118:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,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):189:196 -> a
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.Hu:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.Au:
     com.android.tools.r8.graph.CfCode virtualMethodCode -> d
     com.android.tools.r8.graph.ProgramMethod newDirectMethod -> b
     com.android.tools.r8.graph.ProgramMethod virtualMethod -> c
@@ -61041,7 +60767,7 @@
     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.Iu:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.Bu:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
     1:2:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):41:42 -> a
@@ -61083,13 +60809,13 @@
     31:31: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):109 -> a
     31:31: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):102 -> a
     31:31: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-    32:32: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):335:335 -> a
+    32:32: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):322:322 -> a
     32:32:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):137 -> a
     32:32: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):109 -> a
     32:32: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):102 -> a
     32:32: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(4)"]}
-    33:33: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):335:335 -> a
+    33:33: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):322:322 -> a
     33:33:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.getInvokeSpecialBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):137 -> a
     33:33: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):109 -> a
     33:33: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):102 -> a
@@ -61102,7 +60828,7 @@
     58:58: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):130:130 -> a
     58:58: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):102 -> a
     58:58: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.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.Ea:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.Da:
     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
@@ -61179,259 +60905,259 @@
     737:739:void lambda$collectEmulatedInterfaces$5(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):587:589 -> a
     740:743:void lambda$collectEmulatedInterfaces$5(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):588:591 -> a
     744:765:void collectEmulatedInterfacesWithPropagatedTypeArguments(com.android.tools.r8.graph.DexType,java.util.List,java.util.Set,java.util.Map):602:623 -> a
-    766:772: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):660:666 -> a
-    773:773: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):664:664 -> a
-    774:786:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):680:692 -> a
-    787:787:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
-    787:787:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):693 -> a
-    788:788:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):695:695 -> a
-    789:795:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):694:700 -> a
-    796:796:boolean com.android.tools.r8.graph.MethodResolutionResult.isIncompatibleClassChangeErrorResult():0:0 -> a
-    796:796:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):701 -> a
-    797:797:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):746:746 -> a
-    797:797:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):702 -> a
-    798:798:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):705:705 -> a
-    799:799:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addNoSuchMethodErrorThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):754:754 -> a
-    799:799:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):706 -> a
-    800:800:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):709:709 -> a
-    801:801:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addIllegalAccessErrorThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):750:750 -> a
-    801:801:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):710 -> a
-    802:802:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):714:714 -> a
-    803:803:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
-    803:803:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):714 -> a
-    804:807:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):714:717 -> a
-    808:808:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
-    808:808:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):720 -> a
+    766:770:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$6(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):612:616 -> a
+    771:776:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$6(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):613:618 -> a
+    777:783: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):660:666 -> a
+    784:784: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):664:664 -> a
+    785:797:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):680:692 -> a
+    798:798:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
+    798:798:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):693 -> a
+    799:799:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):695:695 -> a
+    800:806:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):694:700 -> a
+    807:807:boolean com.android.tools.r8.graph.MethodResolutionResult.isIncompatibleClassChangeErrorResult():0:0 -> a
+    807:807:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):701 -> a
+    808:808:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addICCEThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):746:746 -> a
+    808:808:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):702 -> a
+    809:809:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):705:705 -> a
+    810:810:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addNoSuchMethodErrorThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):754:754 -> a
+    810:810:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):706 -> a
+    811:811:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):709:709 -> a
+    812:812:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addIllegalAccessErrorThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):750:750 -> a
+    812:812:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):710 -> a
+    813:813:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):714:714 -> a
+    814:814:boolean com.android.tools.r8.graph.MethodResolutionResult.isSuccessfulMemberResolutionResult():0:0 -> a
+    814:814:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):714 -> a
+    815:818:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):714:717 -> a
+    819:819:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
+    819:819:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):720 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    809:809:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
-    809:809:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):720 -> a
-    810:813:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):721:721 -> a
-    819:821:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):727:729 -> a
-    822:827:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):728:733 -> a
-    828:828:void lambda$resolveForwardForSignature$9(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):692:692 -> a
-    829:831:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):740:742 -> a
-    832:832:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
-    832:832:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):742 -> a
-    833:833:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$10(com.android.tools.r8.graph.DexProgramClass):741:741 -> a
-    834:837:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:761 -> a
-    838:838:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():355:355 -> a
-    838:838:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
-    839:844:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:766 -> a
-    845:848: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):779:782 -> a
-    845:848:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):768 -> a
-    849:859: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):780:790 -> a
-    849:859:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):768 -> a
-    860:864:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:771 -> a
-    865:866: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):878:879 -> a
-    865:866: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):872 -> a
-    867:872: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):831:836 -> a
-    867:872: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):863 -> a
-    867:872: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):879 -> a
-    867:872: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):872 -> a
-    873:873: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):864:864 -> a
-    873:873: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):879 -> a
-    873:873: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):872 -> a
-    874:874: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):880:880 -> a
-    874:874: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):872 -> a
-    875:875:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():394:394 -> a
-    875:875:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):893 -> a
-    875:875: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):880 -> a
-    875:875: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):872 -> a
-    876:876:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):894:894 -> a
-    876:876: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):880 -> a
-    876:876: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):872 -> a
-    877:880: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):831:834 -> a
-    877:880:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):896 -> a
-    877:880: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):880 -> a
-    877:880: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):872 -> a
-    881:881: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):340:340 -> a
-    881:881: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):834 -> a
-    881:881:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):896 -> a
-    881:881: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):880 -> a
-    881:881: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):872 -> a
-    882:882:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):897:897 -> a
-    882:882: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):880 -> a
-    882:882: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):872 -> a
-    883:883: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) -> a
-    883:883: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):872 -> a
-    884:884:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.isEmpty():142:142 -> a
-    884:884: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):883 -> a
-    884:884: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):872 -> a
-    885:885:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():194:194 -> a
-    885:885: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):883 -> a
-    885:885: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):872 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    886:886:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():95:95 -> a
-    886:886:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():194 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    886:886: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):883 -> a
-    886:886: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):872 -> a
-    887:887:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():95:95 -> a
-    887:887:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():194 -> a
-    887:887: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):883 -> a
-    887:887: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):872 -> a
-    888:888:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():194:194 -> a
-    888:888: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):883 -> a
-    888:888: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):872 -> a
-    889:891: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):883:885 -> a
-    889:891: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):872 -> a
-    892:897: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):831:836 -> a
-    892:897:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):918 -> a
-    892:897: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):886 -> a
-    892:897: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):872 -> a
-    898:898:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919:919 -> a
-    898:898: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):886 -> a
-    898:898: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):872 -> a
-    899:899: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):886:886 -> a
-    899:899: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):872 -> a
-    900:905: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):474:479 -> a
-    900:905: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):888 -> a
-    900:905: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):872 -> a
-    906:914: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):639:647 -> a
-    906:914: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):479 -> a
-    906:914: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):888 -> a
-    906:914: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):872 -> a
-    915:915:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    915:915: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
-    915:915: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):479 -> a
-    915:915: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):888 -> a
+    820:820:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
+    820:820:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):720 -> a
+    821:824:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):721:721 -> a
+    830:832:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):727:729 -> a
+    833:838:void resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):728:733 -> a
+    839:839:void lambda$resolveForwardForSignature$9(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexEncodedMethod):692:692 -> a
+    840:842:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):740:742 -> a
+    843:843:boolean com.android.tools.r8.utils.collections.ProgramMethodSet.createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
+    843:843:void addSyntheticMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):742 -> a
+    844:844:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$addSyntheticMethod$10(com.android.tools.r8.graph.DexProgramClass):741:741 -> a
+    845:848:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):758:761 -> a
+    849:849:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():355:355 -> a
+    849:849:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761 -> a
+    850:855:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):761:766 -> a
+    856:859: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):779:782 -> a
+    856:859:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):768 -> a
+    860:870: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):780:790 -> a
+    860:870:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):768 -> a
+    871:875:void addThrowingMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):767:771 -> a
+    876:877: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):868:869 -> a
+    878:878:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    878:878: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):869 -> a
+    879:881: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):870:872 -> a
+    882:893:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):847:858 -> a
+    882:893: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):872 -> a
+    894:894: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):872:872 -> a
+    895:895:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):859:859 -> a
+    895:895: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):872 -> a
+    896:897: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):878:879 -> a
+    896:897: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):872 -> a
+    898:903: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):831:836 -> a
+    898:903: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):863 -> a
+    898:903: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):879 -> a
+    898:903: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):872 -> a
+    904:904: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):864:864 -> a
+    904:904: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):879 -> a
+    904:904: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):872 -> a
+    905:905: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):880:880 -> a
+    905:905: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):872 -> a
+    906:906:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():394:394 -> a
+    906:906:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):893 -> a
+    906:906: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):880 -> a
+    906:906: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):872 -> a
+    907:907:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):894:894 -> a
+    907:907: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):880 -> a
+    907:907: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):872 -> a
+    908:911: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):831:834 -> a
+    908:911:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):896 -> a
+    908:911: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):880 -> a
+    908:911: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):872 -> a
+    912:912: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):340:340 -> a
+    912:912: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):834 -> a
+    912:912:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):896 -> a
+    912:912: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):880 -> a
+    912:912: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):872 -> a
+    913:913:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):897:897 -> a
+    913:913: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):880 -> a
+    913:913: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):872 -> a
+    914:914: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):883:883 -> a
+    914:914: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):872 -> a
+    915:915:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo.isEmpty():142:142 -> a
+    915:915: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):883 -> a
     915:915: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):872 -> a
-    916:916: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:647 -> a
-    916:916: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):479 -> a
-    916:916: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):888 -> a
+    916:916:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():194:194 -> a
+    916:916: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):883 -> a
     916:916: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):872 -> a
-    917:917:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):286:286 -> a
-    917:917: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):648 -> a
-    917:917: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):479 -> a
-    917:917: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):888 -> a
-    917:917: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):872 -> a
-    918:918:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.contains(com.android.tools.r8.graph.DexType):234:234 -> a
-    918:918:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):286 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    917:917:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():95:95 -> a
+    917:917:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():194 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    918:918: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):648 -> a
-    918:918: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):479 -> a
-    918:918: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):888 -> a
+    917:917: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):883 -> a
+    917:917: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):872 -> a
+    918:918:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():95:95 -> a
+    918:918:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():194 -> a
+    918:918: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):883 -> a
     918:918: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):872 -> a
-    919:919:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.contains(com.android.tools.r8.graph.DexType):234:234 -> a
-    919:919:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):286 -> a
-    919:919: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):648 -> a
-    919:919: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):479 -> a
-    919:919: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):888 -> a
+    919:919:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.isEmpty():194:194 -> a
+    919:919: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):883 -> a
     919:919: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):872 -> a
-    920:920:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():190:190 -> a
-    920:920: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):484 -> a
-    920:920: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):888 -> a
-    920:920: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):872 -> a
-    921:923: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):99:101 -> a
-    921:923:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():190 -> a
-    921:923: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):484 -> a
-    921:923: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):888 -> a
-    921:923: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):872 -> a
-    924:930: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):481:487 -> a
-    924:930: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):888 -> a
-    924:930: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):872 -> a
-    931:933: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):136:138 -> a
-    931:933: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
-    931:933: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):888 -> a
-    931:933: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):872 -> a
-    934:934: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):490:490 -> a
-    934:934: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):888 -> a
-    934:934: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):872 -> a
-    935:937: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):136:138 -> a
-    935:937: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 -> a
-    935:937: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):888 -> a
-    935:937: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):872 -> a
-    938:938:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909:909 -> a
-    939:939:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():394:394 -> a
-    939:939:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):893 -> a
-    939:939:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
-    940:940:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):894:894 -> a
-    940:940:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
-    941:944: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):831:834 -> a
-    941:944:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):896 -> a
-    941:944:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
-    945:945: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):340:340 -> a
-    945:945: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):834 -> a
-    945:945:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):896 -> a
-    945:945:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
-    946:946:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):897:897 -> a
-    946:946:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
-    947:948:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):910:911 -> a
-    949:952: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):831:834 -> a
-    949:952:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):918 -> a
-    949:952:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):912 -> a
-    953:953:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919:919 -> a
-    953:953:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):912 -> a
-    954:954:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):912:912 -> a
-    1:5:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$6(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):612:616 -> b
-    6:11:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$6(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):613:618 -> b
-    12:15:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$7(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):625:628 -> b
-    16:20:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$7(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):626:630 -> b
-    21:21:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):901:901 -> b
-    22:22:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    22:22:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):902 -> b
-    23:24:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):903:904 -> b
-    25:36:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):847:858 -> b
-    25:36:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):903 -> b
-    37:37:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):903:903 -> b
-    38:38:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):859:859 -> b
-    38:38:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):903 -> b
-    39:39:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):905:905 -> b
-    40: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):931:933 -> b
-    40: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):927 -> b
-    43:48: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):831:836 -> b
-    43:48:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):918 -> b
-    43:48: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):934 -> b
-    43:48: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):927 -> b
-    49:49:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919:919 -> b
-    49:49: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):934 -> b
-    49:49: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):927 -> b
-    50:52: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):934:936 -> b
-    50:52: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):927 -> b
-    53:55: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):444:446 -> b
-    53:55: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):937 -> b
-    53:55: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):927 -> b
-    56:56:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():390:390 -> b
-    56:56: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):447 -> b
-    56:56: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):937 -> b
-    56:56: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):927 -> b
-    57:61: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):447:451 -> b
-    57:61: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):937 -> b
-    57:61: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):927 -> b
-    62:64: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):431:433 -> b
-    62:64: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):938 -> b
-    62:64: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):927 -> b
-    65:65:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    65:65: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):435 -> b
-    65:65: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):938 -> b
-    65:65: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):927 -> b
-    66:66:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():390:390 -> b
-    66:66: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):435 -> b
-    66:66: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):938 -> b
-    66:66: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):927 -> b
-    67:69: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):435:437 -> b
-    67:69: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):938 -> b
-    67:69: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):927 -> b
-    1:2: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):868:869 -> c
-    3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
-    3:3: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):869 -> c
-    4:6: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):870:872 -> c
-    7:18:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):847:858 -> c
-    7:18: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):872 -> c
-    19:19: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):872:872 -> c
-    20:20:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):859:859 -> c
-    20:20: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):872 -> c
-    1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> d
-    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):923 -> d
-    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():394:394 -> d
-    2:2: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):923 -> d
-    3: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):924:926 -> d
-    6:17:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):847:858 -> d
-    6:17: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):926 -> d
-    18:18: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):926:926 -> d
-    19:19:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):859:859 -> d
-    19:19: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):926 -> d
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.xa:
+    920:922: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):883:885 -> a
+    920:922: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):872 -> a
+    923:928: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):831:836 -> a
+    923:928:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):918 -> a
+    923:928: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):886 -> a
+    923:928: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):872 -> a
+    929:929:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919:919 -> a
+    929:929: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):886 -> a
+    929:929: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):872 -> a
+    930:930: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):886:886 -> a
+    930:930: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):872 -> a
+    931:936: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):474:479 -> a
+    931:936: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):888 -> a
+    931:936: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):872 -> a
+    937:945: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):639:647 -> a
+    937:945: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):479 -> a
+    937:945: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):888 -> a
+    937:945: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):872 -> a
+    946:946:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    946:946: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
+    946:946: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):479 -> a
+    946:946: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):888 -> a
+    946:946: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):872 -> a
+    947:947: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:647 -> a
+    947:947: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):479 -> a
+    947:947: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):888 -> a
+    947:947: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):872 -> a
+    948:948:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):286:286 -> a
+    948:948: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):648 -> a
+    948:948: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):479 -> a
+    948:948: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):888 -> a
+    948:948: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):872 -> a
+    949:949:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.contains(com.android.tools.r8.graph.DexType):234:234 -> a
+    949:949:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):286 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    949:949: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):648 -> a
+    949:949: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):479 -> a
+    949:949: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):888 -> a
+    949:949: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):872 -> a
+    950:950:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.contains(com.android.tools.r8.graph.DexType):234:234 -> a
+    950:950:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo.contains(com.android.tools.r8.graph.DexType):286 -> a
+    950:950: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):648 -> a
+    950:950: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):479 -> a
+    950:950: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):888 -> a
+    950:950: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):872 -> a
+    951:951:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():190:190 -> a
+    951:951: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):484 -> a
+    951:951: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):888 -> a
+    951:951: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):872 -> a
+    952:954: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):99:101 -> a
+    952:954:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo.emulatedInterfaceSignaturesToForward():190 -> a
+    952:954: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):484 -> a
+    952:954: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):888 -> a
+    952:954: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):872 -> a
+    955:961: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):481:487 -> a
+    955:961: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):888 -> a
+    955:961: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):872 -> a
+    962:964: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):136:138 -> a
+    962:964: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
+    962:964: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):888 -> a
+    962:964: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):872 -> a
+    965:965: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):490:490 -> a
+    965:965: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):888 -> a
+    965:965: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):872 -> a
+    966:968: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):136:138 -> a
+    966:968: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 -> a
+    966:968: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):888 -> a
+    966:968: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):872 -> a
+    969:969:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909:909 -> a
+    970:970:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():394:394 -> a
+    970:970:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):893 -> a
+    970:970:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
+    971:971:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):894:894 -> a
+    971:971:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
+    972:975: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):831:834 -> a
+    972:975:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):896 -> a
+    972:975:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
+    976:976: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):340:340 -> a
+    976:976: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):834 -> a
+    976:976:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):896 -> a
+    976:976:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
+    977:977:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitLibraryClassInfo(com.android.tools.r8.graph.DexType):897:897 -> a
+    977:977:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):909 -> a
+    978:979:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):910:911 -> a
+    980:983: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):831:834 -> a
+    980:983:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):918 -> a
+    980:983:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):912 -> a
+    984:984:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919:919 -> a
+    984:984:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):912 -> a
+    985:985:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfoRaw(com.android.tools.r8.graph.DexLibraryClass):912:912 -> 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):923 -> b
+    2:2:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.ignoreLibraryInfo():394:394 -> b
+    2:2: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):923 -> b
+    3: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):924:926 -> b
+    6:17:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):847:858 -> b
+    6:17: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):926 -> b
+    18:18: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):926:926 -> b
+    19:19:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):859:859 -> b
+    19:19: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):926 -> b
+    20:23:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$7(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):625:628 -> b
+    24:28:void lambda$collectEmulatedInterfacesWithPropagatedTypeArguments$7(java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType):626:630 -> b
+    29:29:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):901:901 -> b
+    30:30:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
+    30:30:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):902 -> b
+    31:32:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):903:904 -> b
+    33:44:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):847:858 -> b
+    33:44:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):903 -> b
+    45:45:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):903:903 -> b
+    46:46:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):859:859 -> b
+    46:46:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):903 -> b
+    47:47:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitLibraryClassInfo(com.android.tools.r8.graph.DexClass):905:905 -> b
+    48:50: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):931:933 -> b
+    48:50: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):927 -> b
+    51:56: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):831:836 -> b
+    51:56:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):918 -> b
+    51:56: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):934 -> b
+    51:56: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):927 -> b
+    57:57:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.itf.ClassProcessor.visitInterfaceInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):919:919 -> b
+    57:57: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):934 -> b
+    57:57: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):927 -> b
+    58:60: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):934:936 -> b
+    58:60: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):927 -> b
+    61:63: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):444:446 -> b
+    61:63: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):937 -> b
+    61:63: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):927 -> b
+    64:64:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():390:390 -> b
+    64:64: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):447 -> b
+    64:64: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):937 -> b
+    64:64: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):927 -> b
+    65:69: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):447:451 -> b
+    65:69: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):937 -> b
+    65:69: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):927 -> b
+    70:72: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):431:433 -> b
+    70:72: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):938 -> b
+    70:72: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):927 -> b
+    73:73:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
+    73:73: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):435 -> b
+    73:73: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):938 -> b
+    73:73: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):927 -> b
+    74:74:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor.needsLibraryInfo():390:390 -> b
+    74:74: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):435 -> b
+    74:74: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):938 -> b
+    74:74: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):927 -> b
+    75:77: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):435:437 -> b
+    75:77: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):938 -> b
+    75:77: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):927 -> b
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.wa:
     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
@@ -61440,7 +61166,7 @@
     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):126:129 -> <init>
     1:5:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):146:150 -> a
     6:6:boolean lambda$isTargetedByForwards$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod):149:149 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.ya:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.xa:
     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
@@ -61467,21 +61193,21 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():230:230 -> a
     18:18:boolean isEmpty():282 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.za:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.ya:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces EMPTY -> b
     java.util.Set emulatedInterfaces -> a
     1:1:void <clinit>():217:217 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):221:222 -> <init>
     3:4:void <init>(java.util.Set):225:226 -> <init>
     1:4:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):242:245 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.Aa:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.za:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> d
     1:1:void <clinit>():327:327 -> <clinit>
     1:1:void <init>():330:330 -> <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) -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):340:340 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.Ba:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.Aa:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures EMPTY -> b
     java.util.Set signatures -> a
     1:1:void <clinit>():70:70 -> <clinit>
@@ -61494,7 +61220,7 @@
     3:3:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():95:95 -> a
     3:3:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):86 -> a
     4:6:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):89:91 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.Ca:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.Ba:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
     java.util.function.BiConsumer reportMissingTypeCallback -> c
@@ -61509,7 +61235,7 @@
     12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppInfo.definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):167:167 -> a
     12:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):316 -> a
     13:13:void reportMissingType(com.android.tools.r8.graph.DexType):320:320 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.Da:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.Ca:
     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
@@ -61546,7 +61272,7 @@
     12:12:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):181 -> a
     13:15:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):184:186 -> a
     16:20:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):207:211 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.Xe:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.Se:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -61554,7 +61280,7 @@
     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$Collection -> com.android.tools.r8.internal.We:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.Re:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection EMPTY -> c
@@ -61564,7 +61290,7 @@
     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.ci:
+com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.Xh:
     java.util.Map emulatedInterfaces -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -61572,10 +61298,10 @@
     1:8:void <init>(com.android.tools.r8.graph.AppView):27:34 -> <init>
     1:1:void lambda$new$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):36:36 -> a
     2:2:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):41:41 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     3:3:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     4:4:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):41 -> a
     5:8:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):41:44 -> a
     9:15:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):56:62 -> a
@@ -61604,7 +61330,7 @@
     68:68:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):90:90 -> a
     68:68:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):45 -> a
     69:74:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):45:50 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.Gt:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.zt:
     1:1:java.lang.String getCompanionClassNameSuffix():16:16 -> a
     2:2:java.lang.String getCompanionClassDescriptor(java.lang.String):28:28 -> a
     3:3:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getCompanionClassDescriptor(java.lang.String):135:135 -> a
@@ -61612,7 +61338,7 @@
     1:1:java.lang.String getDefaultMethodPrefix():20:20 -> b
     1:1:java.lang.String getEmulateLibraryClassNameSuffix():12:12 -> c
     1:1:java.lang.String getPrivateMethodPrefix():24:24 -> d
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.Ht:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.At:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.cf.CfVersion MAX_INTERFACE_DESUGARED_CF_VERSION -> c
     java.util.function.Predicate shouldIgnoreFromReportsPredicate -> b
@@ -61625,10 +61351,10 @@
     2:2:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):96 -> a
     3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):96:96 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     4:4:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     5:5:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):96 -> a
     6:10:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):96:100 -> a
     11:25:boolean isCompatibleDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):104:118 -> a
@@ -61648,10 +61374,10 @@
     63:63:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     63:63:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):266 -> a
     64:64:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):267:267 -> a
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     65:65:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):267 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    66:66:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     66:66:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):267 -> a
     67:73:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):267:273 -> a
     74:86:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):271:283 -> a
@@ -61782,10 +61508,10 @@
     6:6:com.android.tools.r8.graph.Code lambda$ensurePrivateAsMethodOfProgramCompanionClassStub$7(com.android.tools.r8.graph.DexMethod):372:372 -> d
     1:1:com.android.tools.r8.graph.Code lambda$ensureStaticAsMethodOfProgramCompanionClassStub$14(com.android.tools.r8.graph.DexMethod):457:457 -> e
     2:2:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):590:590 -> e
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.Jt:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.Ct:
     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.Kt:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.Dt:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor classProcessor -> d
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor interfaceProcessor -> c
@@ -61798,7 +61524,7 @@
     7:7:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64:64 -> a
     1:3:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):50:50 -> b
     7:8:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):54:55 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.Mt:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.Ft:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> d
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Set precedingDesugarings -> h
@@ -62109,12 +61835,12 @@
     9:9: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 -> d
     9:9:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):598 -> d
     10:13:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):597:600 -> d
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.Lt:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.Et:
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor ExcludeDexResources -> c
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor IncludeAllResources -> b
     1:3:void <clinit>():106:108 -> <clinit>
     1:1:void <init>(java.lang.String,int):104:104 -> <init>
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.Nt:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.Gt:
     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>
@@ -62132,7 +61858,7 @@
     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.Rt:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.Kt:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     java.util.Map postProcessingInterfaceInfos -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -62234,7 +61960,7 @@
     2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():429:429 -> c
     2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():260 -> c
     3:29:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():261:287 -> c
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.Pt:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.It:
     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):402:403 -> <init>
@@ -62256,13 +61982,13 @@
     4:4:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):424 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):424:424 -> f
-    1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraNewMethodSignatures():408:408 -> n
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.Ot:
+    1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraNewMethodSignatures():408:408 -> o
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.Ht:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap extraNewMethodSignatures -> d
     1:3:void <init>():432:434 -> <init>
     1:4:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.AppView):443:446 -> a
     1:1:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):438:438 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.Qt:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.Jt:
     java.util.Map defaultMethodsToImplementation -> a
     java.util.Map methodsToMove -> b
     boolean hasNonClinitDirectMethods -> c
@@ -62279,7 +62005,7 @@
     1:1:boolean hasNonClinitDirectMethods():372:372 -> f
     1:1:void setHasBridgesToRemove():384:384 -> g
     1:1:void setHasNonClinitDirectMethods():376:376 -> h
-com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.QM:
+com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.GM:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -62300,10 +62026,10 @@
     34:37:java.util.LinkedHashMap resolveDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):119:122 -> a
     38:40:void lambda$resolveDispatchCases$5(java.util.LinkedHashMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):124:124 -> a
     41:41:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):131:131 -> a
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     42:42:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):131 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:43:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     43:43:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):131 -> a
     44:49:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):131:136 -> a
     50:59:void lambda$synthesizeClasses$6(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):138:147 -> a
@@ -62320,15 +62046,15 @@
     62:64:void com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):157:159 -> a
     62:64:void lambda$synthesizeClasses$6(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):140 -> a
     1:1:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):66:66 -> b
-com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.Sk:
+com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.Nk:
     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.IA:
+com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.BA:
     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.KA:
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.DA:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set directTargetedLambdaImplementationMethods -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):54:54 -> <init>
@@ -62362,7 +62088,7 @@
     78:79:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):183 -> a
     80:80:boolean com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring.isLambdaInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):189:189 -> a
     80:80:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):183 -> a
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke -> com.android.tools.r8.internal.JA:
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke -> com.android.tools.r8.internal.CA:
     java.util.Collection desugarInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator) -> a
 com.android.tools.r8.ir.desugar.nest.AccessBridgeFactory -> com.android.tools.r8.internal.v1:
     boolean $assertionsDisabled -> a
@@ -62389,7 +62115,7 @@
     27:31: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:90 -> b
     32: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):83:94 -> b
     44:44: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.he:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.ge:
     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
@@ -62402,67 +62128,67 @@
     26:26:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$4(java.util.List,com.android.tools.r8.ir.desugar.nest.Nest):74 -> a
     27:29:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$4(java.util.List,com.android.tools.r8.ir.desugar.nest.Nest):75:77 -> a
     30:30:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$5(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.DexClasspathClass):100:100 -> a
-    31:31:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108:108 -> a
-    32:32:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):17:17 -> a
-    32:32:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
+    31:31:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106:106 -> a
+    32:32:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):76:76 -> a
+    32:32:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106 -> a
+    33:33:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):76:76 -> a
+    33:33:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:35:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):17:19 -> a
-    33:35:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
-    36:36:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    36:36:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):20 -> a
-    36:36:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
-    37:37:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):22:22 -> a
-    37:37:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
+    34:34:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108:108 -> a
+    35:35:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):17:17 -> a
+    35:35:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    36:38:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):17:19 -> a
+    36:38:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
+    39:39:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    39:39:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):20 -> a
+    39:39:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
+    40:40:void com.android.tools.r8.graph.ClasspathMethod.registerCodeReferencesForDesugaring(com.android.tools.r8.graph.UseRegistry):22:22 -> a
+    40:40:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$6(com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer,com.android.tools.r8.graph.ClasspathMethod):108 -> a
     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):981:981 -> b
+    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):969:969 -> b
     11:11:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):981:981 -> b
+    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):969:969 -> b
     12:12:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
     13:13:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> b
-    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):983 -> b
+    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):971 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):983:983 -> b
+    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):971:971 -> b
     14:14:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    15:15:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):987:987 -> b
-    15:15:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):983 -> b
+    15:15:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):975:975 -> b
+    15:15:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):971 -> b
     15:15:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
     16:16:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":21,"2":22,"3":23}}
-    21:21:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):988:988 -> b
-    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):983 -> b
+    21:21:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):976:976 -> b
+    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):971 -> b
     21:21:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):988:988 -> b
-    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):983 -> b
+    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):976:976 -> b
+    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):971 -> b
     22:22:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    23:23:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):988:988 -> b
-    23:23:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):983 -> b
+    23:23:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):976:976 -> b
+    23:23:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):971 -> b
     23:23:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    17:18:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):988:989 -> b
-    17:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):983 -> b
+    17:18:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):976:977 -> b
+    17:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):971 -> b
     17:18:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):983:983 -> b
+    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):971:971 -> b
     19:19:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):981:981 -> b
+    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):969:969 -> b
     20:20:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
     24:24:void clearNestAttributes():59:59 -> b
-    25:25:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106:106 -> b
-    26:26:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):76:76 -> b
-    26:26:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106 -> b
-    27:27:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):76:76 -> b
-    27:27:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:void reportDesugarDependencies():40:40 -> c
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.fe:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.ee:
     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 -> b
     1:1:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):95:95 -> c
     1:1:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):90:90 -> d
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.ge:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.fe:
     com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring this$0 -> f
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer eventConsumer -> e
     1:3:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):117:119 -> <init>
@@ -62494,7 +62220,7 @@
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> h
     6:6:void registerInvoke(com.android.tools.r8.graph.DexMethod):135 -> h
     7:9:void registerInvoke(com.android.tools.r8.graph.DexMethod):135:137 -> h
-com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.tG:
+com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.jG:
     com.android.tools.r8.graph.DexClass hostClass -> a
     java.util.List members -> b
     java.util.List missingMembers -> c
@@ -62508,7 +62234,7 @@
     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.vG:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.lG:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map syntheticNestConstructorTypes -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -62556,8 +62282,8 @@
     void lambda$getMethodBridgeReference$5(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder) -> a
     void lambda$getMethodBridgeReference$6(com.android.tools.r8.graph.DexClasspathClass) -> a
     60:60:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):78:78 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1854:1854 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():523 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1842:1842 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():522 -> a
     61:61:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     62:64:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):79:81 -> a
@@ -62687,15 +62413,15 @@
     246:246:com.android.tools.r8.graph.DexMethod getFieldAccessBridgeReference(com.android.tools.r8.graph.DexClassAndField,boolean):384:384 -> a
     250:253:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):438:441 -> a
     254:279:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):440:465 -> a
-    280:282:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2660:2662 -> a
+    280:282:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2658:2660 -> a
     280:282:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):465 -> a
-    283:286:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2661:2664 -> a
+    283:286:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2659:2662 -> a
     283:286:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):465 -> a
     287:287:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):466:466 -> a
-    288:288:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> a
+    288:288:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
     288:288:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):466 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    289:289:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):339:339 -> a
+    289:289:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):326:326 -> a
     289:289:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):466 -> a
     290:293:com.android.tools.r8.graph.DexMethod getMethodBridgeReference(com.android.tools.r8.graph.DexClassAndMethod):469:472 -> a
     294:297:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.getMethodBridgeName(com.android.tools.r8.graph.DexClassAndMethod):477:480 -> a
@@ -62723,7 +62449,7 @@
     320:320:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$7(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):453 -> a
     321:326:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$7(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):453:458 -> a
     327:333:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$7(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):456:462 -> a
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.uG:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.kG:
     com.android.tools.r8.graph.DexClassAndMember target -> b
     com.android.tools.r8.graph.DexMethod bridge -> a
     boolean $assertionsDisabled -> c
@@ -62732,17 +62458,17 @@
     1:1:com.android.tools.r8.graph.DexMethod getBridge():115:115 -> a
     1:1:com.android.tools.r8.graph.DexClassAndMember getTarget():119:119 -> b
     1:1:boolean shouldAddBridge():123:123 -> c
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.wG:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.mG:
     void acceptNestFieldGetBridge(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) -> c
     void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.VP:
+com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.LP:
     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
     37:37:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):75:75 -> a
     38:64:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):58:84 -> a
-    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     65:65:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):84 -> a
     1:27:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):88:114 -> b
     28:44:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):111:127 -> b
@@ -62776,22 +62502,22 @@
     280:294:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):298:312 -> b
     295:295:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):309:309 -> b
     296:507:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):106:317 -> b
-    508:508:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> b
+    508:508:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> b
     508:508:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):317 -> b
-    509:509:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> b
-    509:509:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b
+    509:509:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> b
+    509:509:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b
     509:509:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):317 -> b
-    510:510:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> b
-    510:510:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b
+    510:510:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> b
+    510:510:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b
     510:510:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):317 -> b
-com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter -> com.android.tools.r8.internal.WP:
+com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter -> com.android.tools.r8.internal.MP:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):42:43 -> <init>
     1:2:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):34:35 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     3:3:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     4:4:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):35 -> a
     5:6:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):36:37 -> a
     7:7:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):49:49 -> a
@@ -62812,7 +62538,7 @@
     34:49:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):60 -> a
     50:50:com.android.tools.r8.cf.code.CfInvokeDynamic com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.writeRecordInvokeDynamic(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):97:97 -> a
     50:50:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):60 -> a
-com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.aQ:
+com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.QP:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto recordToStringHelperProto -> c
@@ -62959,9 +62685,9 @@
     10:12:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):333 -> b
     13:23:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):334:344 -> b
     24:37:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):341:354 -> b
-com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.bQ:
+com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.RP:
     void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.gQ:
+com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.WP:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.conversion.IRConverter irConverter -> b
@@ -63024,7 +62750,7 @@
     72:72:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):86:86 -> a
     72:72:void rewriteRecordFieldValues():61 -> a
     73:90:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):133:150 -> a
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.iQ:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.YP:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:31:boolean isInvokeDynamicOnRecord(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):33:63 -> a
@@ -63040,7 +62766,7 @@
     74:74:boolean com.android.tools.r8.ir.desugar.records.RecordRewriterHelper.isInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):28:28 -> a
     74:74:com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106 -> a
     75:87:com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106:118 -> a
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.hQ:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.XP:
     com.android.tools.r8.graph.DexString methodName -> a
     com.android.tools.r8.graph.DexString fieldNames -> c
     com.android.tools.r8.graph.DexField[] fields -> d
@@ -63060,7 +62786,7 @@
     1:1:com.android.tools.r8.graph.DexProto getMethodProto():168:168 -> e
     1:1:com.android.tools.r8.graph.DexProgramClass getRecordClass():156:156 -> f
     1:1:com.android.tools.r8.graph.DexType getRecordType():152:152 -> g
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.GW:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.wW:
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> b
     java.util.Map paramTypeToAppendMethod -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
@@ -63157,12 +62883,12 @@
     598:598:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     598:598:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):422 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):49:49 -> b
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.CW:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.sW:
     int variableIndex -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,int):376:377 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk asArgumentChunk() -> a
     1:1:int getVariableIndex():381:381 -> d
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.DW:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.tW:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:1:void <clinit>():337:337 -> <clinit>
@@ -63177,7 +62903,7 @@
     3:3:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> c
     3:3:com.android.tools.r8.ir.code.ValueType getValueType():350 -> c
     4:5:com.android.tools.r8.ir.code.ValueType getValueType():350:351 -> c
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.EW:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.uW:
     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
@@ -63203,12 +62929,12 @@
     37:37:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):312 -> a
     38:54:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):312:328 -> a
     55:59:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):326:330 -> a
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.FW:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.vW:
     com.android.tools.r8.graph.DexString stringConstant -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):400:401 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk asConstantChunk() -> b
     1:1:com.android.tools.r8.graph.DexString getStringConstant():405:405 -> d
-com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.dZ:
+com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.TY:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto twrCloseResourceProto -> c
@@ -63280,7 +63006,7 @@
     1:4:java.util.Collection rewriteTwrGetSuppressedInvoke(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):96:99 -> b
     5:13:java.util.Collection rewriteTwrGetSuppressedInvoke(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):98:106 -> b
     14:14:java.util.Collection rewriteTwrGetSuppressedInvoke(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):100:100 -> b
-com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.D3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.C3:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString kotlinTransformation -> e
     com.android.tools.r8.graph.AppView appView -> a
@@ -63401,10 +63127,10 @@
     273:273:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():353:353 -> a
     273:273:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):538 -> a
     274:274:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):539:539 -> a
-com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.B3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.A3:
     int[] $SwitchMap$com$android$tools$r8$AssertionsConfiguration$AssertionTransformationScope -> a
     1:1:void <clinit>():53:53 -> <clinit>
-com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.C3:
+com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString -> com.android.tools.r8.internal.B3:
     com.android.tools.r8.graph.DexString value -> b
     com.android.tools.r8.AssertionsConfiguration entry -> a
     boolean $assertionsDisabled -> c
@@ -63436,7 +63162,7 @@
     1:1:boolean isCompileTimeDisabled():93:93 -> c
     1:1:boolean isCompileTimeEnabled():89:89 -> d
     1:1:boolean isPassthrough():97:97 -> e
-com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.U3:
+com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.T3:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():62:62 -> <clinit>
@@ -63564,66 +63290,63 @@
     674:682:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.ir.optimize.AssumeInserter.findDominatedPredecessorIndexesInPhi(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value,java.util.Set):645:653 -> a
     674:682:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):476 -> a
     683:687:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance lambda$computeDominanceForAssumedValues$6(java.util.Map,com.android.tools.r8.ir.code.LazyDominatorTree,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):477:481 -> a
-    691:691:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):420:420 -> a
-    692:692:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):453:453 -> a
-    693:693:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):470:470 -> a
-    694:694:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524:524 -> a
-    695:695:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    695:695:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524 -> a
-    696:702:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):533:539 -> a
-    703:703:void materializeSelectedAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Set,java.util.Map,java.util.function.Predicate):554:554 -> a
-    704:708:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):556:560 -> a
-    709:713:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):626:630 -> a
-    709:713:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
-    714:714:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":784,"2":785,"3":786}}
-    784:784:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    784:784:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
-    785:785:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    785:785:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
-    786:786:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    786:786:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
-    715:715:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():692:692 -> a
-    715:715:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):563 -> a
+    691:691:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):453:453 -> a
+    692:692:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):470:470 -> a
+    693:693:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524:524 -> a
+    694:694:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
+    694:694:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524 -> a
+    695:701:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):533:539 -> a
+    702:702:void materializeSelectedAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Set,java.util.Map,java.util.function.Predicate):554:554 -> a
+    703:707:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):556:560 -> a
+    708:712:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):626:630 -> a
+    708:712:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
+    713:713:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":780,"2":781,"3":782}}
+    780:780:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    780:780:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
+    781:781:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    781:781:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
+    782:782:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
+    782:782:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):561 -> a
+    714:714:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():692:692 -> a
+    714:714:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):563 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    716:717:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
-    716:717:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):565 -> a
-    718:723:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):566:571 -> a
-    724:729:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):567:572 -> a
-    730:730:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    730:730:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):572 -> a
-    731:731:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):573:573 -> a
-    732:732:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverythingElse():0:0 -> a
-    732:732:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):574 -> a
-    733:733:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):575:575 -> a
-    734:737:void com.android.tools.r8.ir.code.Value.replacePhiUsers(com.android.tools.r8.ir.code.Value):620:623 -> a
-    734:737:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):576 -> a
-    738:738:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isSomething():0:0 -> a
-    738:738:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):577 -> a
-    739:756:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):578:595 -> a
-    757:762:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):592:597 -> a
-    763:764:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
-    763:764:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):600 -> a
-    765:783:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):601:619 -> a
-    787:792:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):583:588 -> a
-    793:793:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):617:617 -> a
-    794:795:boolean com.android.tools.r8.ir.optimize.AssumeInserter.isNullableReferenceType(com.android.tools.r8.ir.code.Value):662:663 -> a
-    794:795:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):668 -> a
-    796:799:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):669:672 -> a
-    800:800:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
-    800:800:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):347 -> a
+    715:716:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
+    715:716:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):565 -> a
+    717:722:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):566:571 -> a
+    723:728:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):567:572 -> a
+    729:729:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
+    729:729:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):572 -> a
+    730:730:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):573:573 -> a
+    731:731:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverythingElse():0:0 -> a
+    731:731:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):574 -> a
+    732:733:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):575:576 -> a
+    734:734:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isSomething():0:0 -> a
+    734:734:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):577 -> a
+    735:752:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):578:595 -> a
+    753:758:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):592:597 -> a
+    759:760:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
+    759:760:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):600 -> a
+    761:779:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):601:619 -> a
+    783:788:void lambda$materializeSelectedAssumeInstructions$11(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):583:588 -> a
+    789:789:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):617:617 -> a
+    790:791:boolean com.android.tools.r8.ir.optimize.AssumeInserter.isNullableReferenceType(com.android.tools.r8.ir.code.Value):662:663 -> a
+    790:791:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):668 -> a
+    792:795:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):669:672 -> a
+    796:796:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
+    796:796:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):347 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    801:809:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):351:359 -> a
-    810:810:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):798:798 -> a
-    810:810:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):365 -> a
+    797:805:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):351:359 -> a
+    806:806:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):798:798 -> a
+    806:806:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):365 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    811:812:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):798:799 -> a
-    811:812:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):365 -> a
-    813:813:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):370:370 -> a
-    814:814:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():704:704 -> a
-    814:814:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):374 -> a
-    815:815:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):708:708 -> a
-    815:815:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):373 -> a
+    807:808:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.getAssumedValueInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):798:799 -> a
+    807:808:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):365 -> a
+    809:809:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):370:370 -> a
+    810:810:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():704:704 -> a
+    810:810:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):374 -> a
+    811:811:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):708:708 -> a
+    811:811:boolean lambda$removeRedundantAssumeInstructions$0(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):373 -> a
     boolean lambda$materializeSelectedAssumeInstructions$10(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
     1:12:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):230:241 -> b
     13:20:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22:29 -> b
@@ -63636,18 +63359,19 @@
     24:24:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):245 -> b
     25:40:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):246:261 -> b
     41:54:boolean computeAssumedValuesFromSingleTarget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):260:273 -> b
-    55:106:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):493:544 -> b
-    107:107:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
-    107:107:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):544 -> b
-    108:108:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):544:544 -> b
-    109:109:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):530:530 -> b
-    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):530 -> b
-    111:111:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):618:618 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.L3:
+    55:55:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):420:420 -> b
+    56:107:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):493:544 -> b
+    108:108:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
+    108:108:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):544 -> b
+    109:109:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):544:544 -> b
+    110:110:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):530:530 -> b
+    111:111:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> b
+    111:111:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):530 -> b
+    112:112:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):618:618 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.K3:
     1:1:void <init>():902:902 -> <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.K3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.J3:
     java.util.Map dominatedPhiUsers -> c
     com.android.tools.r8.ir.code.Value assumedValue -> a
     java.util.Set dominatedUsers -> b
@@ -63665,7 +63389,7 @@
     13:13:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():986:986 -> 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):950:950 -> a
     14:14:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():986 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.M3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.L3:
     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
@@ -63674,7 +63398,7 @@
     1:2:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):687:688 -> <init>
     1:1:boolean isNonNull():725:725 -> a
     1:1:void setNotNull():729:729 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.O3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.N3:
     java.util.Map assumedValues -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():746:746 -> <clinit>
@@ -63699,7 +63423,7 @@
     33:33:void removeAll(java.util.Map):815:815 -> a
     34:38:void lambda$removeAll$3(com.android.tools.r8.ir.code.Instruction,java.util.Map):817:821 -> a
     39:56:void removeIf(com.android.tools.r8.utils.TriPredicate):828:845 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.N3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.M3:
     java.util.Map assumedValues -> a
     java.util.Set nonNullValuesKnownToDominateAllUsers -> b
     1:7:void <init>():850:856 -> <init>
@@ -63729,34 +63453,34 @@
     1:1:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):889 -> b
     2:2:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):889:889 -> b
     3:3:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):888:888 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.P3:
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.O3:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance INSTANCE -> a
     1:1:void <clinit>():993:993 -> <clinit>
     1:1:void <init>():995:995 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance getInstance():998:998 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.Q3:
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.P3:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1009:1009 -> <clinit>
     1:1:void <init>():1012:1012 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance getInstance():1015:1015 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.R3:
+com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.Q3:
     com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1026:1026 -> <clinit>
     1:1:void <init>():1028:1028 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance getInstance():1031:1031 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.S3:
+com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.R3:
     java.util.Map dominatedPhiUsers -> b
     java.util.Set dominatedUsers -> a
     1:3:void <init>(java.util.Set,java.util.Map):1046:1048 -> <init>
     com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
     1:1:java.util.Map getDominatedPhiUsers():1056:1056 -> b
     1:1:java.util.Set getDominatedUsers():1052:1052 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.T3:
+com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.S3:
     com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance INSTANCE -> a
     1:1:void <clinit>():1072:1072 -> <clinit>
     1:1:void <init>():1074:1074 -> <init>
     1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance getInstance():1077:1077 -> b
-com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.V3:
+com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.U3:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
     java.util.Set assumeInstructionsToRemove -> d
@@ -63789,7 +63513,7 @@
     43:43:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):65 -> a
     1:1:java.util.Set getAffectedValues():52:52 -> b
     1:1:boolean mayHaveIntroducedTrivialPhi():56:56 -> c
-com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.D4:
+com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.C4:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     int[] hashes -> b
     boolean $assertionsDisabled -> c
@@ -63808,7 +63532,7 @@
     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.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.Y9:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.X9:
     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
@@ -63881,16 +63605,16 @@
     736:736:java.util.Set lambda$findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts$4(com.android.tools.r8.graph.DexField):461:461 -> a
     737:737:java.util.Map validateFinalFieldPuts(java.util.Map,java.util.Map):519:519 -> a
     738:740:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):537:539 -> a
-    741:741:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    741:741:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     741:741:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):539 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    742:742:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    742:742:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     742:742:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):539 -> a
     743:745:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):542:544 -> a
     746:746:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     746:746:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544 -> a
     747:748: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.W9:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.V9:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -63900,13 +63624,13 @@
     2:3:void forEachOptimizedField(java.util.function.BiConsumer):80:81 -> a
     4:9:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):94:99 -> a
     1:3:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):86:88 -> b
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.X9:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.W9:
     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.Db:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.Cb:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -64287,123 +64011,126 @@
     3276:3276:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
     3276:3276:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3321 -> a
     3277:3277:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3325:3325 -> a
-    3278:3281:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3336:3339 -> a
-    3282:3282:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6623,"2":6624,"3":6625}}
-    6623:6623:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3340:3340 -> a
-    6624:6624:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3340:3340 -> a
+    3278:3280:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3336:3338 -> a
+    3281:3283:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> a
+    3281:3283:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3338 -> a
+    3284:3284:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3339:3339 -> a
+    3285:3285:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6626,"2":6627,"3":6628}}
+    6626:6626:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3340:3340 -> a
+    6627:6627:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3340:3340 -> a
+    6628:6628:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3340:3340 -> a
     6625:6625:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3340:3340 -> a
-    6622:6622:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3340:3340 -> a
-    6626:6646:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3460:3480 -> a
-    6647:6647:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    6647:6647:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3480 -> a
-    6648:6664:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3480:3496 -> a
-    6665:6665:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3495:3495 -> a
-    6666:6677:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3494:3505 -> a
-    6678:6700:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3516:3538 -> a
-    6701:6702:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
-    6701:6702:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
-    6701:6702:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3538 -> a
-    6703:6703:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3539:3539 -> a
-    6704:6705:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3576:3577 -> a
-    6704:6705:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
-    6706:6706:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
-    6706:6706:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3577 -> a
-    6706:6706:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
-    6707:6707:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3578:3578 -> a
-    6707:6707:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
-    6708:6708:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
-    6708:6708:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3578 -> a
-    6708:6708:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
-    6709:6738:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3581:3610 -> a
-    6709:6738:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
-    6739:6742:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3544:3547 -> a
-    6743:6743:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
-    6743:6743:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3547 -> a
-    6744:6744:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3548:3548 -> a
-    6745:6745:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
-    6745:6745:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3548 -> a
-    6746:6756:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3549:3559 -> a
-    6757:6757:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    6757:6757:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3561 -> a
-    6758:6759:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3562:3563 -> a
-    6760:6764:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3621:3625 -> a
-    6760:6764:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3563 -> a
-    6765:6766:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
-    6765:6766:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
-    6765:6766:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3625 -> a
-    6765:6766:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3563 -> a
-    6767:6771:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3626:3630 -> a
-    6767:6771:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3563 -> a
-    6772:6772:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3564:3564 -> a
-    6773:6777:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3621:3625 -> a
-    6773:6777:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3564 -> a
-    6778:6779:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
-    6778:6779:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
-    6778:6779:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3625 -> a
-    6778:6779:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3564 -> a
-    6780:6784:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3626:3630 -> a
-    6780:6784:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3564 -> a
-    6785:6785:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3566:3566 -> a
-    6786:6786:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
-    6786:6786:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3566 -> a
-    6787:6789:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3635:3637 -> a
-    6790:6811:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3647:3668 -> a
-    6812:6821:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3667:3676 -> a
-    6822:6842:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3674:3694 -> a
-    6843:6843:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    6843:6843:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3698 -> a
-    6844:6858:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3698:3712 -> a
-    6859:6859:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    6859:6859:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3714 -> a
-    6860:6860:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3714:3714 -> a
-    6861:6864: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):1464:1467 -> a
-    6861:6864:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3714 -> a
-    6865:6865:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3715:3715 -> a
-    6866:6866:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    6866:6866:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3718 -> a
-    6867:6868:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3718:3719 -> a
+    6629:6649:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3460:3480 -> a
+    6650:6650:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    6650:6650:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3480 -> a
+    6651:6667:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3480:3496 -> a
+    6668:6668:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3495:3495 -> a
+    6669:6680:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3494:3505 -> a
+    6681:6703:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3516:3538 -> a
+    6704:6705:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
+    6704:6705:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
+    6704:6705:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3538 -> a
+    6706:6706:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3539:3539 -> a
+    6707:6708:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3576:3577 -> a
+    6707:6708:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
+    6709:6709:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
+    6709:6709:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3577 -> a
+    6709:6709:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
+    6710:6710:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3578:3578 -> a
+    6710:6710:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
+    6711:6711:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.<init>():104:104 -> a
+    6711:6711:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3578 -> a
+    6711:6711:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
+    6712:6741:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3581:3610 -> a
+    6712:6741:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3543 -> a
+    6742:6745:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3544:3547 -> a
+    6746:6746:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
+    6746:6746:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3547 -> a
+    6747:6747:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3548:3548 -> a
+    6748:6748:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>():120:120 -> a
+    6748:6748:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3548 -> a
+    6749:6759:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3549:3559 -> a
+    6760:6760:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    6760:6760:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3561 -> a
+    6761:6762:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3562:3563 -> a
+    6763:6767:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3621:3625 -> a
+    6763:6767:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3563 -> a
+    6768:6769:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
+    6768:6769:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
+    6768:6769:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3625 -> a
+    6768:6769:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3563 -> a
+    6770:6774:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3626:3630 -> a
+    6770:6774:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3563 -> a
+    6775:6775:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3564:3564 -> a
+    6776:6780:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3621:3625 -> a
+    6776:6780:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3564 -> a
+    6781:6782:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
+    6781:6782:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
+    6781:6782:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3625 -> a
+    6781:6782:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3564 -> a
+    6783:6787:void com.android.tools.r8.ir.optimize.CodeRewriter.updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3626:3630 -> a
+    6783:6787:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3564 -> a
+    6788:6788:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3566:3566 -> a
+    6789:6789:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    6789:6789:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3566 -> a
+    6790:6792:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3635:3637 -> a
+    6793:6814:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3647:3668 -> a
+    6815:6824:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3667:3676 -> a
+    6825:6845:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3674:3694 -> a
+    6846:6846:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    6846:6846:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3698 -> a
+    6847:6861:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3698:3712 -> a
+    6862:6862:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    6862:6862:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3714 -> a
+    6863:6863:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3714:3714 -> a
+    6864:6867: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):1464:1467 -> a
+    6864:6867:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3714 -> a
+    6868:6868:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3715:3715 -> a
     6869:6869:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
-    6869:6869:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3721 -> a
-    6870:6886:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3721:3737 -> a
-    6887:6887: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):436:436 -> a
-    6887:6887:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3737 -> a
-    6888:6891:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3737:3740 -> a
-    6892:6908:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3738:3754 -> a
-    6909:6916:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3758:3765 -> a
-    6917:6927:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3798:3808 -> a
-    6917:6927:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
-    6928:6933:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766:3771 -> a
-    6934:6934:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3768:3768 -> a
-    6935:6935:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    6935:6935:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3768 -> a
-    6936:6936:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    6936:6936:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    6936:6936:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3768 -> a
+    6869:6869:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3718 -> a
+    6870:6871:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3718:3719 -> a
+    6872:6872:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1200:1200 -> a
+    6872:6872:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3721 -> a
+    6873:6889:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3721:3737 -> a
+    6890:6890: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):436:436 -> a
+    6890:6890:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3737 -> a
+    6891:6894:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3737:3740 -> a
+    6895:6911:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3738:3754 -> a
+    6912:6919:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3758:3765 -> a
+    6920:6930:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3798:3808 -> a
+    6920:6930:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
+    6931:6936:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3766:3771 -> a
     6937:6937:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3768:3768 -> a
-    6938:6938:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3806:3806 -> a
-    6938:6938:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
-    6939:6939:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    6939:6939:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3806 -> a
-    6939:6939:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
-    6940:6940:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    6940:6940:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    6940:6940:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3806 -> a
-    6940:6940:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
+    6938:6938:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    6938:6938:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3768 -> a
+    6939:6939:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    6939:6939:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    6939:6939:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3768 -> a
+    6940:6940:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3768:3768 -> a
     6941:6941:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3806:3806 -> a
     6941:6941:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
-    6942:6942:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3802:3802 -> a
+    6942:6942:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    6942:6942:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3806 -> a
     6942:6942:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
-    6943:6943:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    6943:6943:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3802 -> a
+    6943:6943:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    6943:6943:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    6943:6943:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3806 -> a
     6943:6943:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
-    6944:6944:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    6944:6944:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    6944:6944:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3802 -> a
+    6944:6944:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3806:3806 -> a
     6944:6944:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
     6945:6945:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3802:3802 -> a
     6945:6945:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
-    6946:6952:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3812:3818 -> a
+    6946:6946:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    6946:6946:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3802 -> a
+    6946:6946:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
+    6947:6947:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    6947:6947:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    6947:6947:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3802 -> a
+    6947:6947:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
+    6948:6948:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3802:3802 -> a
+    6948:6948:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3765 -> a
+    6949:6955:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3812:3818 -> a
     1:3:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):183:185 -> b
     4:4:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> b
     4:4:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):185 -> b
@@ -64520,10 +64247,10 @@
     254:255:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):243:244 -> h
     256:262:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):241:247 -> h
     263:263:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):0:0 -> h
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":518,"2":519,"3":520}}
-    518:518:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):247:247 -> h
-    519:519:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):247:247 -> h
-    520:520:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):247:247 -> h
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":511,"2":512,"3":513}}
+    511:511:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):247:247 -> h
+    512:512:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):247:247 -> h
+    513:513:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):247:247 -> h
     510:510:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):247:247 -> h
     1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> i
     1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3413 -> i
@@ -64535,10 +64262,10 @@
     25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3438 -> i
     26:43:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3439:3456 -> i
     1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1315:1315 -> j
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> j
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> j
     2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1315 -> j
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> j
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> j
     3:3:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1315 -> j
     4:8:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1315:1319 -> j
     9:9:void com.android.tools.r8.ir.optimize.AssumeRemover.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:42 -> j
@@ -64567,11 +64294,11 @@
     75:77:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1376:1378 -> j
     1:1:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):939:939 -> k
     1:1:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):935 -> k
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1919:1919 -> k
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1907:1907 -> k
     2:2:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):939 -> k
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):935 -> k
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1919:1919 -> k
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1907:1907 -> k
     3:3:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):939 -> k
     3:3:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):935 -> k
     4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):942:942 -> k
@@ -64599,10 +64326,10 @@
     28:47:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitchForMaxIntOnly(com.android.tools.r8.ir.code.IRCode):976:995 -> l
     28:47:void rewriteSwitchForMaxInt(com.android.tools.r8.ir.code.IRCode):951 -> l
     1:12:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):256:267 -> m
-    13:13:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1543:1543 -> m
+    13:13:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1541:1541 -> m
     13:13:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):267 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1543:1543 -> m
+    14:14:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1541:1541 -> m
     14:14:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):267 -> m
     15:33:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):271:289 -> m
     34:34:boolean com.android.tools.r8.ir.code.Value.isConstZero():808:808 -> m
@@ -64649,10 +64376,10 @@
     74:75:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1974 -> n
     76:85:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1988:1997 -> n
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2225:2225 -> o
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> o
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> o
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2225 -> o
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> o
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> o
     3:3:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2225 -> o
     4:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2228:2236 -> o
     13:29:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2201:2217 -> o
@@ -64688,100 +64415,115 @@
     28:38:boolean com.android.tools.r8.ir.code.BasicBlock.isSimpleAlwaysThrowingPath():1580:1590 -> r
     28:38:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3397 -> r
     28:38:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2585 -> r
-    39:42:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3405:3408 -> r
-    39:42:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2585 -> r
-    43:61:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3365:3383 -> r
-    43:61:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2586 -> r
-    62:64:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3228:3230 -> r
-    62:64:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    65:65:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> r
-    65:65:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3230 -> r
+    39:40:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3405:3406 -> r
+    39:40:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2585 -> r
+    41:43:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> r
+    41:43:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3407 -> r
+    41:43:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2585 -> r
+    44:44:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3408:3408 -> r
+    44:44:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2585 -> r
+    45:55:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3365:3375 -> r
+    45:55:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2586 -> r
+    56:58:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> r
+    56:58:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3376 -> r
+    56:58:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2586 -> r
+    59:63:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3377:3381 -> r
+    59:63:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2586 -> r
+    64:66:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):115:117 -> r
+    64:66:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3382 -> r
+    64:66:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2586 -> r
+    67:67:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3383:3383 -> r
+    67:67:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2586 -> r
+    68:70:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3228:3230 -> r
+    68:70:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    71:71:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> r
+    71:71:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3230 -> r
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    65:65:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    66:84:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3231:3249 -> r
-    66:84:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    85:85:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    85:85:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3250 -> r
-    85:85:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    86:86:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    86:86:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3250 -> r
-    86:86:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    87:89:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3251:3253 -> r
-    87:89:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    90:90:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    90:90:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3254 -> r
-    90:90:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    71:71:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    72:90:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3231:3249 -> r
+    72:90:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
     91:91:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> 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):3254 -> 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):3250 -> r
     91:91:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    92:94:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3255:3257 -> r
-    92:94:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    95:95:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    95:95:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3258 -> r
-    95:95:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    92:92:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    92:92:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3250 -> r
+    92:92:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    93:95:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3251:3253 -> r
+    93:95:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
     96:96:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    96:96:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3258 -> r
+    96:96:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3254 -> r
     96:96:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    97:99:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3259:3261 -> r
-    97:99:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    100:100:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    100:100:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3262 -> r
-    100:100:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    97:97:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    97:97:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3254 -> r
+    97:97:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    98:100:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3255:3257 -> r
+    98:100:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
     101:101:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
-    101:101:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3262 -> r
+    101:101:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3258 -> r
     101:101:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    102:104:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3263:3265 -> r
-    102:104:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    105:105:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> r
-    105:105:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3266 -> r
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    105:105:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    106:106:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> r
-    106:106:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3266 -> r
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    102:102:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    102:102:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3258 -> r
+    102:102:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    103:105:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3259:3261 -> r
+    103:105:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    106:106:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    106:106:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3262 -> r
     106:106:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    107:128:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3268:3289 -> r
-    107:128:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
-    129:136:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2592:2599 -> r
-    137:141:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2628:2632 -> r
-    137:141:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    142:143:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
-    142:143:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2633 -> r
-    142:143:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    144:144:boolean com.android.tools.r8.ir.code.If.isNullTest():94:94 -> r
-    144:144:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2637 -> r
-    144:144:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    145:148:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2638:2641 -> r
-    145:148:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    149:150:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
-    149:150:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2641 -> r
-    149:150:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    151:152:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2645:2646 -> r
-    151:152:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    153:154:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
-    153:154:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2646 -> r
-    153:154:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    155:160:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2651:2656 -> r
-    155:160:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    161:162:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
-    161:162:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2656 -> r
-    161:162:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    163:200:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2661:2698 -> r
-    163:200:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    201:202:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2688:2689 -> r
-    201:202:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    203:204:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2677:2678 -> r
-    203:204:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
-    205:214:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2605:2614 -> r
-    215:216:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
-    215:216:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2614 -> r
-    217:219:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2619:2621 -> r
-    220:220:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> r
-    220:220:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2621 -> r
-    221:224:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2621:2624 -> r
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    107:107:boolean com.android.tools.r8.ir.code.ConstNumber.isIntegerZero():115:115 -> r
+    107:107:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3262 -> r
+    107:107:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    108:110:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3263:3265 -> r
+    108:110:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    111:111:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> r
+    111:111:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3266 -> r
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    111:111:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    112:112:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1599:1599 -> r
+    112:112:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3266 -> r
+    112:112:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    113:134:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3268:3289 -> r
+    113:134:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> r
+    135:142:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2592:2599 -> r
+    143:147:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2628:2632 -> r
+    143:147:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    148:149:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
+    148:149:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2633 -> r
+    148:149:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    150:150:boolean com.android.tools.r8.ir.code.If.isNullTest():94:94 -> r
+    150:150:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2637 -> r
+    150:150:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    151:154:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2638:2641 -> r
+    151:154:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    155:156:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
+    155:156:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2641 -> r
+    155:156:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    157:158:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2645:2646 -> r
+    157:158:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    159:160:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
+    159:160:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2646 -> r
+    159:160:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    161:166:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2651:2656 -> r
+    161:166:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    167:168:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
+    167:168:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2656 -> r
+    167:168:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    169:206:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2661:2698 -> r
+    169:206:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    207:208:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2688:2689 -> r
+    207:208:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    209:210:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfZeroTest(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If):2677:2678 -> r
+    209:210:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2600 -> r
+    211:220:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2605:2614 -> r
+    221:222:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2843:2844 -> r
+    221:222:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2614 -> r
+    223:225:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2619:2621 -> r
+    226:226:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> r
+    226:226:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2621 -> r
+    227:230:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2621:2624 -> r
     1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1706:1735 -> s
     1:14:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1746:1759 -> t
     15:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1846:1849 -> t
@@ -64821,10 +64563,10 @@
     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):3870 -> u
     9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3871:3903 -> u
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.wb:
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.vb:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():2671:2671 -> <clinit>
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.xb:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.wb:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():2392:2392 -> <clinit>
@@ -64859,7 +64601,7 @@
     52:56:int com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):2449 -> a
     52:56:int doHash(java.lang.Object):2392 -> a
     57:62:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2456:2461 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.yb:
+com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.xb:
     boolean anyAffectedValues -> a
     boolean anySimplifications -> b
     boolean $assertionsDisabled -> c
@@ -64868,7 +64610,7 @@
     2:5:void <init>(boolean,boolean):2554:2557 -> <init>
     1:1:boolean anyAffectedValues():2561:2561 -> a
     1:1:boolean anySimplifications():2565:2565 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.zb:
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.yb:
     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
@@ -64892,11 +64634,11 @@
     23:26:com.android.tools.r8.ir.code.BasicBlock build():653 -> a
     27:29:com.android.tools.r8.ir.code.BasicBlock build():655:657 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):632:632 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.zb:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Position):532:533 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.Bb:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.Ab:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():738:738 -> <clinit>
@@ -64936,7 +64678,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16: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
     16:16:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):760 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.Cb:
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.Bb:
     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
@@ -64956,7 +64698,7 @@
     32:33:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):597:598 -> a
     34:34:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):587:587 -> 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):593:593 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.rd:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.qd:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> a
     int numberOfEffectivelyFinalFieldCanonicalization -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> g
@@ -65021,7 +64763,7 @@
     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.qd:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.pd:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):95:95 -> <init>
@@ -65037,7 +64779,7 @@
     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.xe:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.we:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -65089,7 +64831,7 @@
     15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):77 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):78:78 -> b
     17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):77:77 -> b
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.we:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.ve:
     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>():258:266 -> <clinit>
@@ -65100,16 +64842,16 @@
     boolean isMaybeDead() -> c
     boolean isNotDead() -> d
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():279:279 -> e
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.te:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.se:
     1:1:void <init>():259:259 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.ue:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.te:
     1:1:void <init>():267:267 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.ve:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.ue:
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value):283:283 -> <init>
     1:1:java.lang.Iterable getValuesRequiredToBeDead():296:296 -> b
     2:2:java.util.Iterator lambda$getValuesRequiredToBeDead$0(com.android.tools.r8.ir.code.Value):296:296 -> b
-com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.Qe:
+com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.Le:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> c
@@ -65167,10 +64909,10 @@
     477:477:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):266 -> a
     484:486: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):133:135 -> a
     487:495: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):134:142 -> a
-    496:496:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    496:496:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     496:496: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):142 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    497:497:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    497:497:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     497:497: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):142 -> a
     498:502: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):144:148 -> a
     503:503:boolean com.android.tools.r8.graph.DexClassAndMethod.isStructurallyEqualTo(com.android.tools.r8.graph.DexClassAndMethod):41:41 -> a
@@ -65261,7 +65003,7 @@
     9:22:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):230:243 -> b
     9:22:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):213 -> b
     23:30:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):214:221 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.ag:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.Vf:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
@@ -65306,7 +65048,7 @@
     117:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):347:354 -> a
     117:124:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):153 -> a
     125:126:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):155:156 -> a
-    127:127: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):322:322 -> a
+    127:127: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):309:309 -> a
     127:127:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):156 -> a
     128:131:boolean com.android.tools.r8.ir.optimize.Devirtualizer.isRebindingNewClassIntoMainDex(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):417:420 -> a
     128:131:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):158 -> a
@@ -65346,7 +65088,7 @@
     340:340:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
     340:340:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):318 -> a
     341:343:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):318:320 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.Fh:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.Ah:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -65359,7 +65101,7 @@
     9:9:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
     9:9:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):38 -> a
     10:13:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):38:41 -> a
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.internal.Rk:
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.internal.Mk:
     java.util.Map invokesToInline -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
@@ -65389,7 +65131,7 @@
     23:23:com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):148 -> a
     24:24:com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):148:148 -> a
     1:1:com.android.tools.r8.graph.AppView appView():42:42 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.Fn:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.Bn:
     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
@@ -65433,7 +65175,7 @@
     223:245:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):287:309 -> a
     246:246: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.En:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.An:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -65443,7 +65185,7 @@
     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.Ap:
+com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.internal.tp:
     java.util.Set singleCallerInlinedPrunedMethodsForTesting -> g
     com.android.tools.r8.ir.optimize.MultiCallerInliner multiCallerInliner -> e
     com.android.tools.r8.graph.AppView appView -> a
@@ -65580,7 +65322,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:int com.android.tools.r8.graph.DexType.computeHashCode():124:124 -> hashCode
     6:6:int hashCode():275 -> hashCode
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.internal.up:
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.internal.np:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass downcastClass -> e
@@ -65602,10 +65344,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():447:447 -> a
     30: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):575 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     31:31: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):575 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     32:32: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):575 -> a
     33:36: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):576:579 -> a
     37:37:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():481:481 -> a
@@ -65660,18 +65402,18 @@
     215:215:void setRemoveInnerFramePositionForReceiverUse(com.android.tools.r8.ir.code.Instruction):774:774 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getDowncastClass():533:533 -> b
     1:1:void setShouldEnsureStaticInitialization():541:541 -> c
-com.android.tools.r8.ir.optimize.Inliner$InlineResult -> com.android.tools.r8.internal.vp:
+com.android.tools.r8.ir.optimize.Inliner$InlineResult -> com.android.tools.r8.internal.op:
     1:1:void <init>():500:500 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction asInlineAction() -> a
-com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.internal.pp:
     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):792:794 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.xp:
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.qp:
     com.android.tools.r8.graph.DexProgramClass receiverClass -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):838:840 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.internal.yp:
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.internal.rp:
     com.android.tools.r8.ir.optimize.Inliner$Reason NEVER -> g
     com.android.tools.r8.ir.optimize.Inliner$Reason MULTI_CALLER_CANDIDATE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> f
@@ -65680,7 +65422,7 @@
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> b
     1:8:void <clinit>():485:492 -> <clinit>
     1:1:void <init>(java.lang.String,int):484:484 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$RetryAction -> com.android.tools.r8.internal.zp:
+com.android.tools.r8.ir.optimize.Inliner$RetryAction -> com.android.tools.r8.internal.sp:
     1:1:void <init>():779:779 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.c:
     com.android.tools.r8.graph.AppView appView -> a
@@ -65810,12 +65552,12 @@
     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):299:299 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Ep:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.xp:
     com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,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.InliningIRProvider,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.Gp:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.internal.zp:
     boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
@@ -65838,7 +65580,7 @@
     19:19:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):66 -> a
     20:23:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):66:69 -> a
     com.android.tools.r8.graph.AppView appView() -> b
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.rq:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.kq:
     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
@@ -65846,7 +65588,7 @@
     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.PD:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.ID:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set interfaces -> d
@@ -65890,7 +65632,7 @@
     1:2:void linkSubtype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):181:182 -> b
     3:4:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):195:196 -> b
     1:2:void linkSupertype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):176:177 -> c
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.aE:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.TD:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set warnedFields -> c
@@ -66031,7 +65773,7 @@
     409:422:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):543 -> a
     423:423: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):494:494 -> a
     423:423:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):543 -> a
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.ME:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.FE:
     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
@@ -66129,7 +65871,7 @@
     1:1:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155:155 -> d
     2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):273:273 -> d
     2:2: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.yF:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.rF:
     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>
@@ -66137,7 +65879,7 @@
     1:12:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):22:33 -> a
     13:51:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):32:70 -> a
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):55:59 -> a
-com.android.tools.r8.ir.optimize.MultiCallerInliner -> com.android.tools.r8.internal.KF:
+com.android.tools.r8.ir.optimize.MultiCallerInliner -> com.android.tools.r8.internal.DF:
     com.android.tools.r8.graph.AppView appView -> a
     int[] multiCallerInliningInstructionLimits -> c
     com.android.tools.r8.utils.collections.ProgramMethodMap multiInlineCallEdges -> b
@@ -66176,152 +65918,12 @@
     54:54:boolean lambda$stopTrackingCallSitesForMethodIfDefinitelyIneligibleForMultiCallerInlining$3(com.android.tools.r8.graph.ProgramMethod):160:160 -> b
     55:55:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$onLastWaveDone$6(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph):200:200 -> b
     1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):186:186 -> c
-com.android.tools.r8.ir.optimize.NaturalIntLoopRemover -> com.android.tools.r8.internal.qG:
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:1:void <init>():29:29 -> <init>
-    1:1:void run(com.android.tools.r8.ir.code.IRCode):33:33 -> a
-    2:14:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.isComparisonBlock(com.android.tools.r8.ir.code.BasicBlock):45:57 -> a
-    2:14:void run(com.android.tools.r8.ir.code.IRCode):34 -> a
-    15:15:void run(com.android.tools.r8.ir.code.IRCode):35:35 -> a
-    16:27:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.computeLoopPhi(com.android.tools.r8.ir.code.If):197:208 -> a
-    16:27:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):61 -> a
-    16:27:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    28:28:com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.builder(com.android.tools.r8.ir.code.If):321:321 -> a
-    28:28:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):67 -> a
-    28:28:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    29:37:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):123:131 -> a
-    29:37:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    29:37:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    38:38:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    38:38:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):131 -> a
-    38:38:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    38:38:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    39:52:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):131:144 -> a
-    39:52:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    39:52:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    53:53:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    53:53:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):144 -> a
-    53:53:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    53:53:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    54:68:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):145:159 -> a
-    54:68:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    54:68:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    69:69:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> a
-    69:69:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):159 -> a
-    69:69:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    69:69:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    70:79:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):161:170 -> a
-    70:79:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    70:79:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    80:80:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    80:80:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):170 -> a
-    80:80:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    80:80:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    81:98:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopIterator(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):171:188 -> a
-    81:98:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):69 -> a
-    81:98:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    99:99:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):73:73 -> a
-    99:99:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    100:102:java.util.Set com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.computeLoopBody(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):379:381 -> a
-    100:102:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):73 -> a
-    100:102:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    103:103:boolean com.android.tools.r8.utils.WorkList.isEmpty():112:112 -> a
-    103:103:java.util.Set com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.computeLoopBody(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):382 -> a
-    103:103:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):73 -> a
-    103:103:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    104:104:java.util.Set com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.computeLoopBody(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):383:383 -> a
-    104:104:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):73 -> a
-    104:104:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    105:105:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():610:610 -> a
-    105:105:java.util.Set com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.computeLoopBody(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):384 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    105:105:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):73 -> a
-    105:105:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    106:106:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():610:610 -> a
-    106:106:java.util.Set com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.computeLoopBody(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):384 -> a
-    106:106:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):73 -> a
-    106:106:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    107:111:java.util.Set com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.computeLoopBody(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):389:393 -> a
-    107:111:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):73 -> a
-    107:111:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    112:116:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):77:81 -> a
-    112:116:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    117:126:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.analyzeLoopExit(java.util.Set,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder):102:111 -> a
-    117:126:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):83 -> a
-    117:126:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    127:130:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):87:90 -> a
-    127:130:void run(com.android.tools.r8.ir.code.IRCode):35 -> a
-    131:132:void run(com.android.tools.r8.ir.code.IRCode):39:40 -> a
-com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations -> com.android.tools.r8.internal.pG:
-    com.android.tools.r8.ir.code.If comparison -> c
-    java.util.Set loopBody -> g
-    com.android.tools.r8.ir.code.BasicBlock backPredecessor -> f
-    com.android.tools.r8.ir.code.BasicBlock loopBodyEntry -> e
-    boolean $assertionsDisabled -> h
-    int counterIncrement -> b
-    com.android.tools.r8.ir.code.BasicBlock loopExit -> d
-    int initCounter -> a
-    1:1:void <clinit>():229:229 -> <clinit>
-    1:8:void <init>(int,int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.Set):246:253 -> <init>
-    1:1:boolean has1Iteration():334:334 -> a
-    2:7:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.target(int):325:330 -> a
-    2:7:boolean has1Iteration():334 -> a
-    8:8:boolean has1Iteration():334:334 -> a
-    9:14:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.target(int):325:330 -> a
-    9:14:boolean has1Iteration():335 -> a
-    15:15:boolean has1Iteration():335:335 -> a
-    16:16:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):339:339 -> a
-    16:16:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):229 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):339:339 -> a
-    17:17:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):229 -> a
-    18:33:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.updatePhis(com.android.tools.r8.ir.code.BasicBlock):356:371 -> a
-    18:33:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):340 -> a
-    18:33:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):229 -> a
-    34:35:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.patchControlFlow(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):345:346 -> a
-    34:35:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):341 -> a
-    34:35:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):229 -> a
-    36:37:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    36:37:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.patchControlFlow(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):346 -> a
-    36:37:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):341 -> a
-    36:37:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):229 -> a
-    38:42:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.patchControlFlow(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):346:350 -> a
-    38:42:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):341 -> a
-    38:42:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):229 -> a
-    43:44:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    43:44:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.patchControlFlow(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):350 -> a
-    43:44:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):341 -> a
-    43:44:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):229 -> a
-    45:47:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.patchControlFlow(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):350:352 -> a
-    45:47:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):341 -> a
-    45:47:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):229 -> a
-com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder -> com.android.tools.r8.internal.oG:
-    com.android.tools.r8.ir.code.If comparison -> c
-    com.android.tools.r8.ir.code.BasicBlock backPredecessor -> g
-    java.util.Set loopBody -> h
-    com.android.tools.r8.ir.code.BasicBlock loopEntry -> f
-    com.android.tools.r8.ir.code.BasicBlock loopBodyEntry -> e
-    int counterIncrement -> b
-    com.android.tools.r8.ir.code.BasicBlock loopExit -> d
-    int initCounter -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.If):267:268 -> <init>
-    1:1:void setCounterIncrement(int):280:280 -> a
-    2:2:void setBackPredecessor(com.android.tools.r8.ir.code.BasicBlock):296:296 -> a
-    3:4:void setLoop(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):300:301 -> a
-    5:5:void setLoopBody(java.util.Set):305:305 -> a
-    6:6:com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations build():309:309 -> a
-    1:1:void setInitCounter(int):272:272 -> b
-    2:2:void setLoopEntry(com.android.tools.r8.ir.code.BasicBlock):288:288 -> b
-    3:3:com.android.tools.r8.ir.code.BasicBlock getBackPredecessor():292:292 -> b
-    1:1:int getCounterIncrement():276:276 -> c
-    1:1:com.android.tools.r8.ir.code.BasicBlock getLoopEntry():284:284 -> d
-com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.zG:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.pG:
     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():1854:1854 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():523 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1842:1842 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():522 -> a
     3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     4:9:void com.android.tools.r8.ir.optimize.NestReducer.removeNests():50:55 -> a
@@ -66346,7 +65948,7 @@
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):42:42 -> c
     3:3:void processNestMember(com.android.tools.r8.graph.DexProgramClass):100 -> c
     4:6:void processNestMember(com.android.tools.r8.graph.DexProgramClass):100:102 -> c
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.AG:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.qG:
     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
@@ -66370,7 +65972,7 @@
     44:54:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
     55:55:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
     55:55: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.OutlinerImpl -> com.android.tools.r8.internal.mL:
+com.android.tools.r8.ir.optimize.OutlinerImpl -> com.android.tools.r8.internal.cL:
     java.util.Map outlineSites -> b
     java.util.Map generatedOutlines -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
@@ -66423,10 +66025,10 @@
     135:135:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$buildOutlineMethods$6(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):1523:1523 -> a
     136:136:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1534:1534 -> a
     137:146:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1533:1542 -> a
-    147:147:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    147:147:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     147:147:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1542 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    148:148:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    148:148:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     148:148:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1542 -> a
     149:149:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1544:1544 -> a
     150:150:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1543:1543 -> a
@@ -66474,7 +66076,7 @@
     29:50:java.util.List buildOutlineMethods():1527:1548 -> c
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.OutlinerImpl):120:120 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.OutlinerImpl):120:120 -> e
-com.android.tools.r8.ir.optimize.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.aL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.QK:
     com.android.tools.r8.ir.code.NumericType numericType -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):229:230 -> <init>
     boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens) -> a
@@ -66531,7 +66133,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():241 -> hashCode
     2:2:int hashCode():241:241 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.bL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.RK:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -66581,7 +66183,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():439 -> hashCode
     2:6:int hashCode():439:443 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.cL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.SK:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):336:337 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction):357:357 -> a
@@ -66612,7 +66214,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():352 -> hashCode
     2:2:int hashCode():352:352 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$Outline -> com.android.tools.r8.internal.dL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$Outline -> com.android.tools.r8.internal.TK:
     java.util.List argumentTypes -> b
     java.util.List templateInstructions -> d
     java.util.List argumentMap -> c
@@ -66657,7 +66259,7 @@
     1:18:boolean equals(java.lang.Object):638:655 -> equals
     1:6:int hashCode():663:668 -> hashCode
     1:37:java.lang.String toString():724:760 -> toString
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.eL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.UK:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> e
     com.android.tools.r8.ir.optimize.OutlinerImpl$Outline outline -> d
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1772:1773 -> <init>
@@ -66670,7 +66272,7 @@
     int estimatedDexCodeSizeUpperBoundInBytes() -> q0
     int estimatedSizeForInlining() -> r0
     1:1:java.lang.String toString():1805:1805 -> toString
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.gL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.WK:
     com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():140:140 -> <clinit>
@@ -66683,18 +66285,18 @@
     java.lang.String getInstructionName() -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.fL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.VK:
 # {"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.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.hL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.XK:
     java.util.List outlinesForMethod -> p
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):1189:1190 -> <init>
     1:1:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1195:1195 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.iL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.YK:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> t
     boolean $assertionsDisabled -> u
     com.android.tools.r8.ir.code.IRCode code -> p
@@ -66721,12 +66323,12 @@
     82:82:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1309:1309 -> a
     83:87:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1306:1310 -> a
     88:88:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1308:1308 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.jL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.ZK:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> p
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List):1202:1203 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1208:1210 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1209:1209 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.kL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.aL:
     com.android.tools.r8.ir.optimize.OutlinerImpl$Outline outline -> a
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> e
     boolean $assertionsDisabled -> f
@@ -66763,7 +66365,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1748:1748 -> e
     1:1:int getMoveExceptionRegister(int):1736:1736 -> f
     int instructionOffset(int) -> g
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.lL:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.bL:
     com.android.tools.r8.graph.DexType returnType -> j
     int returnValueUniqueUsersLeft -> l
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> n
@@ -66907,13 +66509,13 @@
     262:291:void candidate(int,int):1130:1159 -> a
     292:302:void reset(int):1164:1174 -> a
     1:7:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):975:981 -> b
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     8:8:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):981 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     9:9:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):981 -> b
     10:16:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):984:990 -> b
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.GL:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.wL:
     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
@@ -67034,7 +66636,7 @@
     428:428:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466 -> a
     429:432:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466:469 -> a
     1:1: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.JL:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.zL:
     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
     7:8:boolean com.android.tools.r8.ir.optimize.PhiOptimizations.predecessorsHaveNormalFlow(com.android.tools.r8.ir.code.BasicBlock):28:29 -> b
@@ -67060,16 +66662,16 @@
     17:30: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):145 -> b
     17:30:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     31:31:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":68,"2":69,"3":70}}
-    68:68:int com.android.tools.r8.ir.optimize.PhiOptimizations.getRelativeStackHeightForInstruction(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    68:68: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):145 -> b
-    68:68:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-    69:69:int com.android.tools.r8.ir.optimize.PhiOptimizations.getRelativeStackHeightForInstruction(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    69:69: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):145 -> b
-    69:69:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-    70:70:int com.android.tools.r8.ir.optimize.PhiOptimizations.getRelativeStackHeightForInstruction(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):72:72 -> b
-    70:70: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):145 -> b
-    70:70:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":65,"2":66,"3":67}}
+    65:65:int com.android.tools.r8.ir.optimize.PhiOptimizations.getRelativeStackHeightForInstruction(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):72:72 -> b
+    65:65: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):145 -> b
+    65:65:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
+    66:66:int com.android.tools.r8.ir.optimize.PhiOptimizations.getRelativeStackHeightForInstruction(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):72:72 -> b
+    66:66: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):145 -> b
+    66:66:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
+    67:67:int com.android.tools.r8.ir.optimize.PhiOptimizations.getRelativeStackHeightForInstruction(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):72:72 -> b
+    67:67: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):145 -> b
+    67:67:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     32:33: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):148:149 -> b
     32:33:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     34:34:boolean com.android.tools.r8.ir.code.Instruction.isStore():0:0 -> b
@@ -67082,7 +66684,7 @@
     39:50:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     51:64: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
     51:64:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination -> com.android.tools.r8.internal.sQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination -> com.android.tools.r8.internal.iQ:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState activeState -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -67341,14 +66943,14 @@
     654:654:void run():414 -> c
     655:656:void run():414:415 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):62:62 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot -> com.android.tools.r8.internal.jQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot -> com.android.tools.r8.internal.ZP:
     com.android.tools.r8.ir.code.MemberType memberType -> b
     com.android.tools.r8.ir.code.Value array -> a
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):157:157 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):162:164 -> <init>
     boolean maybeHasIndex(int) -> a
     1:5:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot create(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):168:172 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithConstantIndex -> com.android.tools.r8.internal.kQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithConstantIndex -> com.android.tools.r8.internal.aQ:
     int index -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):186:186 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.MemberType):191:192 -> <init>
@@ -67357,7 +66959,7 @@
     6:6:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot.baseEquals(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):182:182 -> equals
     6:6:boolean equals(java.lang.Object):214 -> equals
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithValueIndex -> com.android.tools.r8.internal.lQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithValueIndex -> com.android.tools.r8.internal.bQ:
     com.android.tools.r8.ir.code.Value index -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):218:218 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):223:224 -> <init>
@@ -67366,7 +66968,7 @@
     6:6:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot.baseEquals(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):182:182 -> equals
     6:6:boolean equals(java.lang.Object):246 -> equals
     1:1:int hashCode():234:234 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState -> com.android.tools.r8.internal.mQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState -> com.android.tools.r8.internal.cQ:
     java.util.LinkedHashMap arraySlotValues -> a
     java.util.LinkedHashSet initializedClasses -> d
     int maxCapacity -> j
@@ -67484,7 +67086,7 @@
     4:4:int com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.size(java.util.Set):1366:1366 -> i
     4:4:int size():1358 -> i
     5:9:int size():1358:1362 -> i
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates -> com.android.tools.r8.internal.nQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates -> com.android.tools.r8.internal.dQ:
     java.util.LinkedHashMap activeStateAtExit -> a
     int capacity -> b
     boolean $assertionsDisabled -> c
@@ -67521,7 +67123,7 @@
     80:80:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):896:896 -> a
     80:80:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):927 -> a
     81:83:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):928:930 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue -> com.android.tools.r8.internal.oQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue -> com.android.tools.r8.internal.eQ:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination this$0 -> b
     com.android.tools.r8.ir.code.Value value -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):109:109 -> <init>
@@ -67535,7 +67137,7 @@
     139:139:java.lang.String toString():136:136 -> toString
     140:140:java.lang.String toString():136:136 -> toString
     137:137:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject -> com.android.tools.r8.internal.pQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject -> com.android.tools.r8.internal.fQ:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -67545,10 +67147,10 @@
     1:1:com.android.tools.r8.graph.DexField access$1100(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject):250:250 -> a
     1:5:boolean equals(java.lang.Object):267:271 -> equals
     1:1:int hashCode():262:262 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.internal.qQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.internal.gQ:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue asExistingValue() -> a
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction) -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$MaterializableValue -> com.android.tools.r8.internal.rQ:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$MaterializableValue -> com.android.tools.r8.internal.hQ:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination this$0 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue value -> a
     boolean $assertionsDisabled -> c
@@ -67559,7 +67161,7 @@
     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.Instruction):153 -> a
     5:5:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):152:152 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.VR:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.KR:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:11:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:51 -> a
@@ -67626,15 +67228,15 @@
     179:179: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):111 -> a
     180: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):111: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():481:481 -> a
+    217:217:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> 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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    218:218:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    218:218:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     218:218: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
     219: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):146:148 -> a
     222:222: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
     223:225: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.cU:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.ST:
     java.util.List serviceLoadMethods -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> c
@@ -67653,10 +67255,10 @@
     33:95:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):114:176 -> a
     96:109:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):175:188 -> a
     110: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):179:180 -> a
-    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     112:112: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):180 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    113:113:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    113:113:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     113:113: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):180 -> a
     114:114: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):182:182 -> a
     115:115: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):181:181 -> a
@@ -67684,18 +67286,18 @@
     241:241:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$2(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):215 -> a
     242:270: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
     242:270:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$2(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):215 -> a
-    271:271:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    271:271:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     271:271: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):118 -> a
     271:271:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$2(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):215 -> a
-    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    272:272:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     272:272: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):118 -> a
     272:272:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$2(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):215 -> a
-    273:273:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    273:273:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    273:273:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    273:273:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     273:273: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):118 -> a
     273:273:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$2(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):215 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.bU:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.RT:
     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
@@ -67712,7 +67314,7 @@
     31:31:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):269 -> a
     32:33:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):269:270 -> a
     34:34:boolean lambda$perform$1(com.android.tools.r8.ir.code.Instruction):274:274 -> a
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis -> com.android.tools.r8.internal.DU:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis -> com.android.tools.r8.internal.tU:
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult NO_RESULT -> a
     boolean $assertionsDisabled -> b
     1:214:void <clinit>():31:244 -> <clinit>
@@ -67742,7 +67344,7 @@
     141:141:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult triggersClassInitializationBeforeAnyStaticRead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):338 -> a
     142:142:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$triggersClassInitializationBeforeAnyStaticRead$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):342:342 -> a
     143:161:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$triggersClassInitializationBeforeAnyStaticRead$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):341:359 -> a
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1 -> com.android.tools.r8.internal.wU:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1 -> com.android.tools.r8.internal.mU:
     com.android.tools.r8.utils.IntBox val$visitedInstructions -> e
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder val$builder -> g
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis val$analysis -> f
@@ -67769,21 +67371,21 @@
     47:47:void com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder.setFailingBlocksForPartialResults(java.util.List):227:227 -> a
     47:47:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):301 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis -> com.android.tools.r8.internal.xU:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis -> com.android.tools.r8.internal.nU:
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect analyze(com.android.tools.r8.ir.code.Instruction) -> a
     int maxNumberOfInstructions() -> a
     1:1:java.util.List getSuccessors(com.android.tools.r8.ir.code.BasicBlock):161:161 -> a
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.yU:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.oU:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect.$assertionsDisabled -> a
     1:1:void com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect.<clinit>():33:33 -> <clinit>
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.zU:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.pU:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState.isNotComputed() -> a
     boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState.isPartial() -> b
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks -> com.android.tools.r8.internal.AU:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks -> com.android.tools.r8.internal.qU:
     java.util.List failingBlocks -> b
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState state -> a
     boolean $assertionsDisabled -> c
@@ -67796,7 +67398,7 @@
     9:12:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks joinChildren(java.util.List):128 -> a
     13:25:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks joinChildren(java.util.List):130:142 -> a
     1:1:java.util.List access$500(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks):110:110 -> b
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult -> com.android.tools.r8.internal.BU:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult -> com.android.tools.r8.internal.rU:
     java.util.List satisfyingInstructions -> b
     java.util.List topmostNotSatisfiedBlocks -> c
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState result -> a
@@ -67809,7 +67411,7 @@
     2:2:java.util.List getTopmostNotSatisfiedBlocks():192:192 -> a
     1:1:boolean isNotSatisfied():200:200 -> b
     1:1:boolean isPartial():208:208 -> c
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder -> com.android.tools.r8.internal.CU:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder -> com.android.tools.r8.internal.sU:
     java.util.List failingBlocksForPartialResults -> b
     java.util.List satisfyingInstructions -> a
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState result -> c
@@ -67818,7 +67420,7 @@
     1:1:void setResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState):231:231 -> a
     2:4:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult build():235:237 -> a
     1:1:void fail():219:219 -> b
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.BX:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.rX:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> f
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
@@ -67904,7 +67506,7 @@
     99:100:boolean optimize():105 -> f
     101:101:void com.android.tools.r8.ir.optimize.SwitchCaseEliminator.replaceSwitchByGoto():153:153 -> f
     101:101:boolean optimize():105 -> f
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.CX:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.sX:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -67914,26 +67516,26 @@
     2:10:void <init>(com.android.tools.r8.graph.AppView):68:76 -> <init>
     1:7:com.android.tools.r8.shaking.AppInfoWithLiveness run():80:86 -> a
     8:15:void processClasses(com.android.tools.r8.graph.DexProgramClass):91:98 -> a
-    16:38:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:125 -> a
-    39:39:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    39:39:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):125 -> a
-    40:59:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):125:144 -> a
-    60:60:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    60:60:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):145 -> a
-    61:73:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):148:160 -> a
-    74:74:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
-    75:75:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    75:75:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122 -> a
-    76:76:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
-    77:79:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
-    80:80:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    80:80:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167 -> a
-    81:81:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167:167 -> a
-    82:82:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    82:82:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167 -> a
-    83:83:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167:167 -> a
-    1:1:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):98:98 -> b
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.g10:
+    16:16:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):98:98 -> a
+    17:39:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):103:125 -> a
+    40:40:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    40:40:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):125 -> a
+    41:60:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):125:144 -> a
+    61:61:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    61:61:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):145 -> a
+    62:74:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):148:160 -> a
+    75:75:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
+    76:76:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    76:76:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122 -> a
+    77:77:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
+    78:80:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
+    81:81:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    81:81:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167 -> a
+    82:82:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167:167 -> a
+    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.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.W00:
     1:20:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowClassCastExceptionIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):61:80 -> a
     21:27:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):73:79 -> a
     28:28: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):86:86 -> a
@@ -67947,7 +67549,7 @@
     17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwIllegalAccessError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):86:99 -> b
     17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowIllegalAccessErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):115 -> b
     17:30:com.android.tools.r8.graph.Code lambda$synthesizeThrowIllegalAccessErrorMethod$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):107 -> b
-    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> b
+    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> b
     31:31:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwIllegalAccessError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):99 -> b
     31:31:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowIllegalAccessErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):115 -> b
     31:31:com.android.tools.r8.graph.Code lambda$synthesizeThrowIllegalAccessErrorMethod$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):107 -> b
@@ -67963,7 +67565,7 @@
     17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwIncompatibleClassChangeError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):110:123 -> c
     17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowIncompatibleClassChangeErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):144 -> c
     17:30:com.android.tools.r8.graph.Code lambda$synthesizeThrowIncompatibleClassChangeErrorMethod$6(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):136 -> c
-    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> c
+    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> c
     31:31:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwIncompatibleClassChangeError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):123 -> c
     31:31:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowIncompatibleClassChangeErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):144 -> c
     31:31:com.android.tools.r8.graph.Code lambda$synthesizeThrowIncompatibleClassChangeErrorMethod$6(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):136 -> c
@@ -67979,7 +67581,7 @@
     17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwNoSuchMethodError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):133:146 -> d
     17:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowNoSuchMethodErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):173 -> d
     17:30:com.android.tools.r8.graph.Code lambda$synthesizeThrowNoSuchMethodErrorMethod$8(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):165 -> d
-    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> d
+    31:31:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> d
     31:31:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwNoSuchMethodError(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):146 -> d
     31:31:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowNoSuchMethodErrorCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):173 -> d
     31:31:com.android.tools.r8.graph.Code lambda$synthesizeThrowNoSuchMethodErrorMethod$8(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):165 -> d
@@ -67991,9 +67593,9 @@
     22:27:void lambda$synthesizeToStringIfNotNullMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):44:49 -> e
     28:28: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):56:56 -> e
     28:28:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):48 -> e
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.e10:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.U00:
     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.f10:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.V00:
     com.android.tools.r8.graph.ProgramMethod method -> a
     boolean optimized -> b
     boolean $assertionsDisabled -> c
@@ -68003,7 +67605,7 @@
     1:2:com.android.tools.r8.graph.ProgramMethod getMethod():186:187 -> a
     3:4:void optimize(com.android.tools.r8.ir.conversion.MethodProcessor):195:196 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod uncheckedGetMethod():191:191 -> b
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.ga:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.fa:
     java.util.concurrent.ConcurrentHashMap knownClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():40:40 -> <clinit>
@@ -68055,12 +67657,12 @@
     161:161: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
     162:163: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):271:272 -> a
     162:163: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.fa:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.ea:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NOT_ELIGIBLE -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus 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.ha:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.ga:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.inliner.InliningIRProvider inliningIRProvider -> b
     boolean $assertionsDisabled -> e
@@ -68075,11 +67677,11 @@
     15:24:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):71:80 -> a
     25:54:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):111:140 -> a
     25:54:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     55:55:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     55:55:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    56:56:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    56:56:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     56:56:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):140 -> a
     56:56:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     57:57:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
@@ -68092,18 +67694,18 @@
     61:68:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     69:70:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):129:130 -> a
     69:70:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     71:71:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     71:71:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     72:72:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):130 -> a
     72:72:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     73:73:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):82:82 -> a
     74:76:boolean com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.exceedsInstructionBudgetAfterIncrement(int):98:100 -> a
     74:76:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):83 -> a
     77:77:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):92:92 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.ka:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.ja:
     java.util.Map deferredAliasValidityChecks -> c
     java.util.Set receiverAliases -> a
     java.util.Set illegalReceiverAliases -> b
@@ -68127,7 +67729,7 @@
     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.ik:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.dk:
     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
@@ -68152,7 +67754,7 @@
     104:104:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):160 -> a
     105:108: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
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.sp:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.lp:
     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
@@ -68549,14 +68151,14 @@
     61:61:void rebindIndirectEligibleInstanceUsersFromPhis():584 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:62:void rebindIndirectEligibleInstanceUsersFromPhis():584:584 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.rp:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.kp:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():1254:1254 -> <clinit>
     1:2:void <init>():1256:1257 -> <init>
 com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext -> com.android.tools.r8.internal.L1:
     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.K5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.J5:
     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>
@@ -68578,7 +68180,7 @@
     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.L5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.K5:
     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>
@@ -68587,7 +68189,7 @@
     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.M5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.L5:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -68601,7 +68203,7 @@
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages getInstance():17:17 -> g
     1:1:int hashCode():55:55 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.ja:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.ia:
     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,com.android.tools.r8.utils.Timing):21:27 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.bottom():64:64 -> 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,com.android.tools.r8.utils.Timing):29 -> a
@@ -68615,12 +68217,12 @@
     25:25: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,com.android.tools.r8.utils.Timing):23:23 -> a
     26:26:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult lambda$analyze$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):33:33 -> a
     27:27:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages lambda$analyze$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult):37:37 -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.Le:
+com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.Ge:
     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.au:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.Tt:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -68654,7 +68256,7 @@
     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.Zt:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.St:
     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
@@ -68683,7 +68285,7 @@
     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.vH:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.lH:
     boolean isParameterUsedAsLock -> e
     boolean $assertionsDisabled -> f
     java.util.Set fieldsReadFromParameter -> a
@@ -68707,7 +68309,7 @@
     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.wH:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.mH:
     java.util.Map backing -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -68788,7 +68390,7 @@
     1:1:int getNumberOfContexts():99:99 -> d
     1:6:boolean equals(java.lang.Object):133:138 -> equals
     1:1:int hashCode():143:143 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.xH:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.nH:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap backing -> a
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration aliasedValueConfiguration -> b
     boolean $assertionsDisabled -> c
@@ -68883,7 +68485,7 @@
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():113 -> e
     1:5:boolean equals(java.lang.Object):228:232 -> equals
     1:1:int hashCode():237:237 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.yL:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.oL:
     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
@@ -68898,13 +68500,13 @@
     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.zL:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.pL:
     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.AL:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.qL:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext) -> a
@@ -68929,7 +68531,7 @@
     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.PY:
+com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.FY:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Set instructionsOfInterest -> g
     com.android.tools.r8.graph.AppView appView -> a
@@ -69113,7 +68715,7 @@
     1:1:boolean lambda$widen$7(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):404:404 -> d
     2:2:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isTop():0:0 -> d
     2:2:boolean lambda$widen$7(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):404 -> d
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.H00:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.x00:
     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>
@@ -69125,7 +68727,7 @@
     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.I00:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.y00:
     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>
@@ -69134,7 +68736,7 @@
     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.J00:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.z00:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -69163,14 +68765,14 @@
     boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):33:33 -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint getInstance():22:22 -> c
-com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.ia:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.ha:
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> 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.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysFalseClassInlinerMethodConstraint alwaysFalse():30:30 -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int) -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint alwaysTrue():34:34 -> b
-com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.fd:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.ed:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages usages -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -69189,7 +68791,7 @@
     33:35:boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.ProgramMethod,int):72:74 -> a
     36:67:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):83:114 -> a
     1:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):66:67 -> b
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.AX:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.qX:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():15:17 -> <clinit>
@@ -69197,7 +68799,7 @@
     1:14:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):26:39 -> a
     15:31:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):44:60 -> a
     32:43: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.EmptyEnumUnboxer -> com.android.tools.r8.internal.Ph:
+com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer -> com.android.tools.r8.internal.Kh:
     com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer INSTANCE -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():29:29 -> <init>
@@ -69214,7 +68816,7 @@
     void unsetRewriter() -> c
     void updateEnumUnboxingCandidatesInfo() -> d
     1:1:com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer get():32:32 -> e
-com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.ri:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.mi:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -69268,7 +68870,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> c
     5:5:boolean matchesValuesField(com.android.tools.r8.graph.DexField):82 -> c
-com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.qi:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.li:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMap unboxedValues -> b
     int valuesSize -> d
@@ -69277,35 +68879,35 @@
     1:1:void <clinit>():85:85 -> <clinit>
     1:5:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableSet,int):101:105 -> <init>
     1:2:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData getInstanceFieldData(com.android.tools.r8.graph.DexField):109:110 -> a
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.wi:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.ri:
     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.si:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.ni:
     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.ti:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.oi:
     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.ui:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.pi:
     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.vi:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.qi:
     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.zi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.ui:
     1:1:void <init>():25:25 -> <init>
     void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -69321,7 +68923,7 @@
     void rewriteWithLens() -> b
     void unsetRewriter() -> c
     void updateEnumUnboxingCandidatesInfo() -> d
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl -> com.android.tools.r8.internal.Bi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl -> com.android.tools.r8.internal.wi:
     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
@@ -69778,7 +69380,7 @@
     1:15:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():764:778 -> e
     1:1:void analyzeInitializers():967:967 -> f
     1:1:com.android.tools.r8.graph.DexClassAndField getOrdinalField():180:180 -> g
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1 -> com.android.tools.r8.internal.Ai:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1 -> com.android.tools.r8.internal.vi:
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens val$graphLens -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl this$0 -> d
     com.android.tools.r8.graph.GraphLens val$codeLens -> b
@@ -69793,7 +69395,7 @@
     8:8:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):726 -> a
     9:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):726:729 -> a
     13:21:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):728:736 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.Ei:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.zi:
     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
@@ -69847,7 +69449,7 @@
     57:59:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:128 -> a
     57:59:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):119 -> a
     60:62:void removePinnedCandidate(com.android.tools.r8.graph.DexType):133:135 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.Gi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.Bi:
     java.util.Map enumTypeToInfo -> a
     java.util.Set prunedMethods -> b
     boolean $assertionsDisabled -> c
@@ -69869,7 +69471,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():62:62 -> c
     1:1:void clear():128:128 -> d
     1:1:boolean isEmpty():58:58 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.Fi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.Ai:
     java.util.Set requiredInstanceFieldData -> c
     com.android.tools.r8.graph.DexProgramClass enumClass -> a
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodDependencies -> b
@@ -69883,7 +69485,7 @@
     4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):158:158 -> a
     1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):131:131 -> b
     2:2:java.util.Set getRequiredInstanceFieldData():162:162 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.Ki:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.Fi:
     1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
     2:22:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:71 -> a
     23:23:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
@@ -69894,13 +69496,13 @@
     48:48:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):90 -> a
     49:51:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):90:92 -> a
     52:92:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):59:99 -> a
-    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    93:93:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     93:93:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):99 -> a
-    94:94:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    94:94:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    94:94:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    94:94:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     94:94:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):99 -> a
-    95:95:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    95:95:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    95:95:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    95:95:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     95:95:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):99 -> a
     1:23:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):103:125 -> b
     24:36:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):122:134 -> b
@@ -69914,13 +69516,13 @@
     65:65:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):158 -> b
     66:69:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):158:161 -> b
     70:122:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):113:165 -> b
-    123:123:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> b
+    123:123:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> b
     123:123:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):165 -> b
-    124:124:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> b
-    124:124:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b
+    124:124:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> b
+    124:124:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b
     124:124:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):165 -> b
-    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> b
-    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b
+    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> b
+    125:125:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b
     125:125:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):165 -> b
     1:21:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):169:189 -> c
     22:32:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):186:196 -> c
@@ -69928,13 +69530,13 @@
     33:33:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196 -> c
     34:35:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196:197 -> c
     36:63:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):177:204 -> c
-    64:64:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> c
+    64:64:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> c
     64:64:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):204 -> c
-    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> c
-    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> c
+    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> c
+    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> c
     65:65:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):204 -> c
-    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> c
-    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> c
+    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> c
+    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> c
     66:66:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):204 -> c
     1:21:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):268:288 -> d
     22:32:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):285:295 -> d
@@ -69942,13 +69544,13 @@
     33:33:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295 -> d
     34:35:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:296 -> d
     36:60:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):276:300 -> d
-    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> d
+    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> d
     61:61:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):300 -> d
-    62:62:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> d
-    62:62:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> d
+    62:62:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> d
+    62:62:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> d
     62:62:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):300 -> d
-    63:63:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> d
-    63:63:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> d
+    63:63:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> d
+    63:63:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> d
     63:63:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):300 -> d
     1:23:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):305:327 -> e
     24:37:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):323:336 -> e
@@ -69956,63 +69558,71 @@
     38:38:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):336 -> e
     39:41:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):336:338 -> e
     42:71:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):313:342 -> e
-    72:72:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> e
+    72:72:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> e
     72:72:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342 -> e
-    73:73:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> e
-    73:73:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> e
+    73:73:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> e
+    73:73:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> e
     73:73:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342 -> e
-    74:74:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> e
-    74:74:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> e
+    74:74:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> e
+    74:74:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> e
     74:74:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):342 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Mi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Hi:
     java.util.Map prototypeChangesPerMethod -> o
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> n
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> p
     boolean $assertionsDisabled -> q
-    1:1:void <clinit>():37:37 -> <clinit>
-    1:5: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):49:53 -> <init>
-    1:4:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):71:74 -> a
-    5:9:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens.rewriteSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):98:102 -> a
-    5:9:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):75 -> a
-    10:10:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens.rewriteSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):101:101 -> a
-    10:10:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):75 -> a
-    11:16:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):79:84 -> a
-    17:33:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):78:94 -> a
-    34:37: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):111:114 -> a
-    38:38:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder(com.android.tools.r8.graph.AppView):120:120 -> a
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:5: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):46:50 -> <init>
+    1:4:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):68:71 -> a
+    5:9:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens.rewriteSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):95:99 -> a
+    5:9:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):72 -> a
+    10:10:com.android.tools.r8.ir.analysis.value.SingleValue com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens.rewriteSingleValue(com.android.tools.r8.ir.analysis.value.SingleValue):98:98 -> a
+    10:10:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):72 -> a
+    11:16:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):76:81 -> a
+    17:33:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):75:91 -> a
+    34:37: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):108:111 -> a
+    38:38:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder(com.android.tools.r8.graph.AppView):117:117 -> a
     boolean hasCustomCodeRewritings() -> f
     boolean isEnumUnboxerLens() -> h
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.Li:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.Gi:
     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>():123:123 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):135:135 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.AppView):126:136 -> <init>
-    1:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder mapUnboxedEnums(java.util.Set):140:141 -> a
-    3:3:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):150:150 -> a
-    4:9:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,java.util.List):163:168 -> a
+    1:1:void <clinit>():120:120 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):132:132 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.AppView):123:133 -> <init>
+    1:2:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder mapUnboxedEnums(java.util.Set):137:138 -> a
+    3:3:void move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):147:147 -> a
+    4:9:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):160:165 -> a
     10:10:int com.android.tools.r8.graph.DexMethod.getNumberOfArguments(boolean):82:82 -> a
-    10:10:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,java.util.List):169 -> a
+    10:10:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):166 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:int com.android.tools.r8.graph.DexMethod.getNumberOfArguments(boolean):82:82 -> a
-    11:11:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,java.util.List):169 -> a
-    12:22:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,java.util.List):169:179 -> a
-    23:37:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,java.util.List):174:188 -> a
-    38:51:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,java.util.List):186:199 -> a
-    52:52:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForRewrittenTypes(com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):69:69 -> a
-    52:52:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,java.util.List):199 -> a
-    53:54:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,java.util.List):200:201 -> a
-    55:57:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):207:209 -> a
-    58:61:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):208:211 -> a
-    62:65:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):210:213 -> a
-    66:69:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):212:215 -> a
-    70:70:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
-    71:77:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.AppView):219:225 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Ni:
+    11:11:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):166 -> a
+    12:21:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):166:175 -> a
+    22:35:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):170:183 -> a
+    36:49:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):181:194 -> a
+    50:50:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createForRewrittenTypes(com.android.tools.r8.graph.proto.RewrittenTypeInfo,com.android.tools.r8.graph.proto.ArgumentInfoCollection):70:70 -> a
+    50:50:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):194 -> a
+    51:51:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):195:195 -> a
+    52:52:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):257:257 -> a
+    52:52:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):195 -> a
+    53:53:void com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter.<init>():20:20 -> a
+    53:53:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):257 -> a
+    53:53:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):195 -> a
+    54:55:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.withExtraUnusedNullParameters(int):258:259 -> a
+    54:55:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):195 -> a
+    56:56:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):196:196 -> a
+    57:59:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):202:204 -> a
+    60:63:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):203:206 -> a
+    64:67:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):205:208 -> a
+    68:71:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):207:210 -> a
+    72:72:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):209:209 -> a
+    73:79:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.AppView):214:220 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Ii:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnumsData -> e
     java.util.Map checkNotNullToCheckNotZeroMapping -> b
     com.android.tools.r8.graph.DexItemFactory factory -> c
@@ -70275,7 +69885,7 @@
     477:477:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):590 -> a
     477:477:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):583 -> a
     478:478:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):581:581 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Pi:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Ki:
     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
@@ -70284,245 +69894,246 @@
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder lensBuilder -> a
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.collections.ProgramMethodMap checkNotNullMethods -> c
-    1:1:void <clinit>():73:73 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):88:97 -> <init>
+    1:1:void <clinit>():72:72 -> <clinit>
+    1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.ir.optimize.enums.EnumDataMap,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses):87:96 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple com.android.tools.r8.ir.optimize.info.OptimizationFeedback.getSimple():44:44 -> a
-    1:1: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):217 -> a
-    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):216:216 -> a
-    3:3:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):129:129 -> a
-    4:67:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):151:214 -> a
-    68:68:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):159:159 -> a
+    1:1: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):216 -> a
+    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):215:215 -> a
+    3:3:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):128:128 -> a
+    4:67:com.android.tools.r8.com.google.common.collect.BiMap duplicateCheckNotNullMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):150:213 -> a
+    68:68:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):158:158 -> a
     69:70:boolean com.android.tools.r8.utils.SetUtils.containsAnyOf(java.util.Set,java.lang.Iterable):19:20 -> a
-    69:70:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):159 -> a
-    71:78:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):167:174 -> a
+    69:70:boolean lambda$duplicateCheckNotNullMethods$1(com.android.tools.r8.graph.ProgramMethod,java.util.Set):158 -> a
+    71:78:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):166:173 -> a
     79:79:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.DexTypeList.getBacking():63:63 -> a
-    79:79:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):174 -> a
+    79:79:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):173 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:80:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):175:175 -> a
+    80:80:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):174:174 -> a
     81:82:java.lang.Object[] com.android.tools.r8.utils.ImmutableArrayUtils.set(java.lang.Object[],int,java.lang.Object):10:11 -> a
-    81:82:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):173 -> a
-    83:83:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):173:173 -> a
-    84:99:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):171:186 -> a
-    100:125:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):180:205 -> a
-    126:129:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):204:207 -> a
-    130:133:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):190:193 -> a
+    81:82:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):172 -> a
+    83:83:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):172:172 -> a
+    84:99:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):170:185 -> a
+    100:125:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):179:204 -> a
+    126:129:void lambda$duplicateCheckNotNullMethods$4(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder,com.android.tools.r8.graph.ProgramMethod,java.util.Set):203:206 -> a
+    130:133:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):189:192 -> a
     134:134:com.android.tools.r8.cf.CfVersion com.android.tools.r8.graph.DexEncodedMethod.getClassFileVersionOrElse(com.android.tools.r8.cf.CfVersion):814:814 -> a
-    134:134:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):194 -> a
+    134:134:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):193 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     135:135:com.android.tools.r8.cf.CfVersion com.android.tools.r8.graph.DexEncodedMethod.getClassFileVersionOrElse(com.android.tools.r8.cf.CfVersion):814:814 -> a
-    135:135:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):194 -> a
-    136:146:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):191:201 -> a
-    147:152:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):198:203 -> a
-    153:153:com.android.tools.r8.graph.Code lambda$duplicateCheckNotNullMethods$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):197:197 -> a
-    154:162:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):239:247 -> a
-    163:163:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.getLocalUtilityClass(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
-    163:163:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):247 -> a
-    164:186:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):250:272 -> a
-    187:187:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    187:187:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):272 -> a
-    188:194:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):276:282 -> a
-    195:195:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    195:195:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):282 -> a
+    135:135:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):193 -> a
+    136:146:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):190:200 -> a
+    147:152:void lambda$duplicateCheckNotNullMethods$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticMethodBuilder):197:202 -> a
+    153:153:com.android.tools.r8.graph.Code lambda$duplicateCheckNotNullMethods$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):196:196 -> a
+    154:154:void lambda$fixupEnumClassInitializers$6(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):232:232 -> a
+    155:163:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):238:246 -> a
+    164:164:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.getLocalUtilityClass(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
+    164:164:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):246 -> a
+    165:187:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):249:271 -> a
+    188:188:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    188:188:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):271 -> a
+    189:195:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):275:281 -> a
     196:196:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    196:196:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):282 -> a
+    196:196:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):281 -> a
+    197:197:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    197:197:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):281 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    197:207:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):282:292 -> a
-    208:208:com.android.tools.r8.ir.code.ConstClass$Builder com.android.tools.r8.ir.code.ConstClass.builder():42:42 -> a
-    208:208:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):294 -> a
-    209:211:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):295:297 -> a
-    212:212: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):436:436 -> a
-    212:212:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):297 -> a
-    213:213:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    198:208:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):281:291 -> a
+    209:209:com.android.tools.r8.ir.code.ConstClass$Builder com.android.tools.r8.ir.code.ConstClass.builder():42:42 -> a
+    209:209:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):293 -> a
+    210:212:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):294:296 -> a
+    213:213: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):436:436 -> a
     213:213:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):296 -> a
-    214:222:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):296:304 -> a
-    223:228:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):303:308 -> a
-    229:229:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):0:0 -> a
+    214:214:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1654:1654 -> a
+    214:214:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):295 -> a
+    215:223:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):295:303 -> a
+    224:229:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):302:307 -> a
+    230:230:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":679,"2":680,"3":681}}
-    679:679:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):308:308 -> a
+    679:679:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):307:307 -> a
     680:680:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    680:680:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):308 -> a
+    680:680:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):307 -> a
     681:681:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    681:681:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):308 -> a
-    538:540:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):309:311 -> a
+    681:681:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):307 -> a
+    538:540:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):308:310 -> a
     541:541:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
-    541:541:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):311 -> a
-    542:550:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):312:320 -> a
+    541:541:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):310 -> a
+    542:550:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):311:319 -> a
     551:551:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):410:410 -> a
-    551:551:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):320 -> a
+    551:551:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):319 -> a
     552:552:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> a
     552:552:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):410 -> a
-    552:552:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):320 -> a
-    553:560:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):321:328 -> a
-    561:561:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
-    561:561:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):329 -> a
+    552:552:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):319 -> a
+    553:560:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):320:327 -> a
+    561:561:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
+    561:561:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):328 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    562:562:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
-    562:562:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):329 -> a
-    563:563:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):330:330 -> a
+    562:562:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
+    562:562:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):328 -> a
+    563:563:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):329:329 -> a
     564:564:com.android.tools.r8.ir.code.InvokeDirect$Builder com.android.tools.r8.ir.code.InvokeDirect.builder():50:50 -> a
-    564:564:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):335 -> a
-    565:601:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):336:372 -> a
-    602:611:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):369:378 -> a
+    564:564:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):334 -> a
+    565:601:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):335:371 -> a
+    602:611:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):368:377 -> a
     612:612:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    612:612:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):378 -> a
-    613:627:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):378:392 -> a
-    628:628:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):391:391 -> a
-    629:629:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):390:390 -> a
-    630:640:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):386:396 -> a
+    612:612:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):377 -> a
+    613:627:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):377:391 -> a
+    628:628:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):390:390 -> a
+    629:629:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):389:389 -> a
+    630:640:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):385:395 -> a
     641:641:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):468:468 -> a
-    641:641:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):396 -> a
+    641:641:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):395 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    642:647:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):397:402 -> a
-    648:649:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560:561 -> a
-    648:649:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):403 -> a
+    642:647:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):396:401 -> a
+    648:649:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):559:560 -> a
+    648:649:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
     650:650:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119:119 -> a
-    650:650:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561 -> a
-    650:650:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):403 -> a
+    650:650:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
+    650:650:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
     651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> a
     651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119 -> a
-    651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561 -> a
-    651:651:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):403 -> a
+    651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
+    651:651:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
     652:652:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127:127 -> a
-    652:652:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561 -> a
-    652:652:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):403 -> a
+    652:652:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
+    652:652:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
     653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> a
     653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127 -> a
-    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561 -> a
-    653:653:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):403 -> a
-    654:654:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):562:562 -> a
-    654:654:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):403 -> a
-    655:661:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):404:410 -> a
+    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
+    653:653:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
+    654:654:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561:561 -> a
+    654:654:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
+    655:661:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):403:409 -> a
     662:662:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
-    662:662:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):411 -> a
-    663:668:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):412:417 -> a
+    662:662:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):410 -> a
+    663:668:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):411:416 -> a
     669:669:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):42:42 -> a
-    669:669:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):417 -> a
+    669:669:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):416 -> a
     670:670:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():24:24 -> a
-    670:670:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):418 -> a
-    671:677:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):420:426 -> a
-    678:678:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):425:425 -> a
-    682:687:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):433:438 -> a
+    670:670:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):417 -> a
+    671:677:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):419:425 -> a
+    678:678:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):424:424 -> a
+    682:687:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):432:437 -> a
     688:688:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    688:688:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):438 -> a
-    689:689:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):453:453 -> a
-    690:690:boolean lambda$createLocalUtilityFields$7(java.util.Map,com.android.tools.r8.graph.DexField):449:449 -> a
-    691:694:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):461:464 -> a
+    688:688:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):437 -> a
+    689:689:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):452:452 -> a
+    690:690:boolean lambda$createLocalUtilityFields$7(java.util.Map,com.android.tools.r8.graph.DexField):448:448 -> a
+    691:694:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):460:463 -> a
     695:695:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    695:695:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):465 -> a
-    696:696:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):465:465 -> a
-    697:709:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):462:474 -> a
-    710:711:void lambda$createLocalUtilityField$10(com.android.tools.r8.graph.DexEncodedField$Builder):479:480 -> a
-    712:713:void lambda$createLocalUtilityField$9(com.android.tools.r8.graph.FieldAccessFlags):482:483 -> a
-    714:714:void lambda$createLocalUtilityMethods$11(java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):497:497 -> a
-    715:724:void lambda$createLocalUtilityMethods$13(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod):501:510 -> a
-    725:725:boolean lambda$createLocalUtilityMethods$12(java.util.Map,com.android.tools.r8.graph.DexMethod):508:508 -> a
-    726:732: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):520:526 -> a
-    733:733:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
-    733:733: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):526 -> a
+    695:695:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):464 -> a
+    696:696:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):464:464 -> a
+    697:709:com.android.tools.r8.graph.DexEncodedField createLocalUtilityField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.function.Predicate):461:473 -> a
+    710:711:void lambda$createLocalUtilityField$10(com.android.tools.r8.graph.DexEncodedField$Builder):478:479 -> a
+    712:713:void lambda$createLocalUtilityField$9(com.android.tools.r8.graph.FieldAccessFlags):481:482 -> a
+    714:714:void lambda$createLocalUtilityMethods$11(java.util.Map,com.android.tools.r8.graph.DexEncodedMethod):496:496 -> a
+    715:724:void lambda$createLocalUtilityMethods$13(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramMethod):500:509 -> a
+    725:725:boolean lambda$createLocalUtilityMethods$12(java.util.Map,com.android.tools.r8.graph.DexMethod):507:507 -> a
+    726:732: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):519:525 -> a
+    733:733:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> a
+    733:733: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):525 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    734:734:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
-    734:734: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):526 -> a
-    735:735: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):527:527 -> a
+    734:734:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> a
+    734:734: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):525 -> a
+    735:735: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):526:526 -> a
     736:736: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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":764,"2":765,"3":766}}
-    764:764: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):527:527 -> a
-    765:765: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):527:527 -> a
-    766:766: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):527:527 -> a
+    764:764: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):526:526 -> a
+    765:765: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):526:526 -> a
+    766:766: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):526:526 -> a
     737:737:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClassAndMember.getName():53:53 -> a
-    737:737: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):528 -> a
-    738:742: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):528:532 -> a
-    743:744:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):646:647 -> a
-    743:744: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):529 -> a
-    745:747:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):664:666 -> a
-    745:747:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):647 -> a
-    745:747: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):529 -> a
-    748:748:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):648:648 -> a
-    748:748: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):529 -> a
-    749:749: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):533:533 -> a
-    750:760: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):527:537 -> a
-    761:761: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):154:154 -> a
-    761:761: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):537 -> a
-    762:763: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):540:541 -> a
-    767:778:void lambda$createLocalUtilityMethod$15(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):545:556 -> a
-    779:783:void lambda$createLocalUtilityMethod$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodAccessFlags):548:552 -> a
-    784:785:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560:561 -> a
-    784:785:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):440 -> a
+    737:737: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):527 -> a
+    738:742: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):527:531 -> a
+    743:744:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):644:645 -> a
+    743:744: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):528 -> a
+    745:747:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):662:664 -> a
+    745:747:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):645 -> a
+    745:747: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):528 -> a
+    748:748:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):646:646 -> a
+    748:748: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):528 -> a
+    749:749: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):532:532 -> a
+    750:760: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):526:536 -> a
+    761:761: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):151:151 -> a
+    761:761: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):536 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    762:763: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):539:540 -> a
+    767:778:void lambda$createLocalUtilityMethod$15(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):544:555 -> a
+    779:783:void lambda$createLocalUtilityMethod$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodAccessFlags):547:551 -> a
+    784:785:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):559:560 -> a
+    784:785:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
     786:786:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119:119 -> a
-    786:786:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561 -> a
-    786:786:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):440 -> a
+    786:786:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
+    786:786:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
     787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> a
     787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119 -> a
-    787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561 -> a
-    787:787:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):440 -> a
+    787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
+    787:787:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
     788:788:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127:127 -> a
-    788:788:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561 -> a
-    788:788:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):440 -> a
+    788:788:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
+    788:788:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
     789:789:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> a
     789:789:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127 -> a
-    789:789:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561 -> a
-    789:789:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):440 -> a
-    790:790:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):562:562 -> a
-    790:790:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):440 -> a
-    791:801:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):441:451 -> a
-    802:802:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):566:566 -> a
-    803:804:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):646:647 -> a
-    803:804:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    805:807:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):664:666 -> a
-    805:807:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):647 -> a
-    805:807:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    808:808:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):648:648 -> a
-    808:808:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567 -> a
-    809:825:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):568:584 -> a
-    826:828:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):583:585 -> a
-    829:831:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):588:590 -> a
-    832:832:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():82:82 -> a
-    832:832:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):590 -> a
-    833:837:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):589:593 -> a
-    838:838:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1436:1436 -> a
-    838:838:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):592 -> a
-    839:845:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):597:603 -> a
-    846:856:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):601:611 -> a
-    857:857:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):331:331 -> a
-    857:857:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):609 -> a
-    858:858: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):335:335 -> a
-    858:858:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):331 -> a
-    858:858:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):609 -> a
-    859:859:boolean lambda$ensureUniqueMethod$17(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):604:604 -> a
-    860:865:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):621:626 -> a
-    866:866: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):213:213 -> a
-    866:866:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):626 -> a
-    867:878:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):627:638 -> a
-    879:879:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):634:634 -> a
-    880:880:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):633:633 -> a
-    881:889:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):652:660 -> a
-    1:6:void fixupEnumClassInitializers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):226:231 -> b
-    7:7:void lambda$fixupEnumClassInitializers$6(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):233:233 -> b
-    8:30:java.util.Collection createLocalUtilityMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):491:513 -> b
-    1:9:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):102:110 -> c
+    789:789:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
+    789:789:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
+    790:790:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561:561 -> a
+    790:790:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
+    791:801:void lambda$createLocalUtilityFields$8(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):440:450 -> a
+    802:802:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):565:565 -> a
+    803:804:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):644:645 -> a
+    803:804:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):566 -> a
+    805:807:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):662:664 -> a
+    805:807:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):645 -> a
+    805:807:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):566 -> a
+    808:808:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):646:646 -> a
+    808:808:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):566 -> a
+    809:824:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):567:582 -> a
+    825:827:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):581:583 -> a
+    828:830:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):586:588 -> a
+    831:831:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():83:83 -> a
+    831:831:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):588 -> a
+    832:836:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):587:591 -> a
+    837:837:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1436:1436 -> a
+    837:837:void lambda$fixupEncodedMethod$16(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):590 -> a
+    838:844:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):595:601 -> a
+    845:855:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):599:609 -> a
+    856:856:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318:318 -> a
+    856:856:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):607 -> a
+    857:857: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):322:322 -> a
+    857:857:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318 -> a
+    857:857:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):607 -> a
+    858:858:boolean lambda$ensureUniqueMethod$17(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):602:602 -> a
+    859:864:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):619:624 -> a
+    865:865: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):213:213 -> a
+    865:865:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):624 -> a
+    866:877:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):625:636 -> a
+    878:878:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):632:632 -> a
+    879:879:void lambda$fixupFields$18(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField$Builder):631:631 -> a
+    880:888:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):650:658 -> a
+    1:6:void fixupEnumClassInitializers(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):225:230 -> b
+    7:29:java.util.Collection createLocalUtilityMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):490:512 -> b
+    1:9:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):101:109 -> c
     10:10:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> c
-    10:10:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):110 -> c
-    11:12:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):112:113 -> c
+    10:10:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):109 -> c
+    11:12:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):111:112 -> c
     13:13:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.getLocalUtilityClass(com.android.tools.r8.graph.DexProgramClass):46:46 -> c
-    13:13:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):113 -> c
-    14:26:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):115:127 -> c
+    13:13:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):112 -> c
+    14:26:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):114:126 -> c
     27:27:void com.android.tools.r8.graph.DexClass.setStaticFields(java.util.Collection):428:428 -> c
-    27:27:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):127 -> c
-    28:45:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):129:146 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.Oi:
+    27:27:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):126 -> c
+    28:45:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):128:145 -> c
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.Ji:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens lens -> b
     com.android.tools.r8.com.google.common.collect.BiMap checkNotNullToCheckNotZeroMapping -> a
     com.android.tools.r8.graph.PrunedItems prunedItems -> c
-    1:4:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.PrunedItems):680:683 -> <init>
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap getCheckNotNullToCheckNotZeroMapping():687:687 -> a
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens getLens():691:691 -> b
-    1:1:com.android.tools.r8.graph.PrunedItems getPrunedItems():695:695 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.Qi:
+    1:4:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens,com.android.tools.r8.graph.PrunedItems):678:681 -> <init>
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap getCheckNotNullToCheckNotZeroMapping():685:685 -> a
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens getLens():689:689 -> b
+    1:1:com.android.tools.r8.graph.PrunedItems getPrunedItems():693:693 -> c
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.Li:
     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.Si:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.Ni:
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap localUtilityClasses -> a
     boolean $assertionsDisabled -> c
@@ -70535,7 +70146,7 @@
     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$Builder -> com.android.tools.r8.internal.Ri:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.Mi:
     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
@@ -70563,7 +70174,7 @@
     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.Ui:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.Pi:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -70614,7 +70225,7 @@
     69:69:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):216 -> a
     70:71:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):319:320 -> a
     70:71:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):216 -> a
-    72:72:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1582:1582 -> a
+    72:72:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1570:1570 -> a
     72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):320 -> a
     72:72:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):216 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
@@ -70731,7 +70342,7 @@
     141:141:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> b
     141:141:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):176 -> b
     142:144:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):176:178 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Ti:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Oi:
     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
@@ -70739,7 +70350,7 @@
     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):373:373 -> <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):386:391 -> <init>
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.tC:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.mC:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> c
     com.android.tools.r8.graph.DexProgramClass localUtilityClass -> b
     boolean $assertionsDisabled -> d
@@ -70785,7 +70396,7 @@
     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():145:145 -> c
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.sC:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.lC:
     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
@@ -70797,7 +70408,7 @@
     1:2:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass build():168:169 -> a
     3:3:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):180:180 -> a
     1:9:com.android.tools.r8.graph.DexProgramClass createClass():173:181 -> b
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.qU:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.gU:
     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):56:58 -> <init>
@@ -70827,7 +70438,7 @@
     7:7:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):125:125 -> e
     1:5:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):120:124 -> f
     6:6:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):121:121 -> f
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.pU:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.fU:
     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
@@ -70851,11 +70462,11 @@
     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):2435:2435 -> a
+    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> 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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2435:2435 -> a
+    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2433:2433 -> 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 -> a
     17:17:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):214 -> 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):245:245 -> a
@@ -70888,7 +70499,7 @@
     76:81:void lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):212:217 -> a
     82:85:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):326:329 -> 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.z9:
+com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.y9:
     int argumentIndex -> a
     1:2:void <init>(int):16:17 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
@@ -70901,12 +70512,12 @@
     6:6:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):48 -> a
     7:9:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):51:53 -> a
     1:1:int getArgumentIndex():21:21 -> c
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.Ci:
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.xi:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification unknown():12:12 -> b
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.Di:
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.yi:
     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():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
@@ -70928,13 +70539,13 @@
     70:70: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):75 -> a
     71:71:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     71:71: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.A00:
+com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.q00:
     com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.A9:
+com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.z9:
     com.android.tools.r8.graph.ProgramMethod checkNotNullMethod -> d
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):39:40 -> <init>
     1:2: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):46:47 -> a
@@ -70978,7 +70589,7 @@
     123:123:java.lang.String toString():120:120 -> toString
     124:124:java.lang.String toString():120:120 -> toString
     121:121:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.SP:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.IP:
     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
@@ -71004,7 +70615,7 @@
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason OTHER_UNSUPPORTED_INSTRUCTION -> w
     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.PP:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.FP:
     com.android.tools.r8.graph.DexMethod invokedMethod -> x
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):70:71 -> <init>
     1:1:java.lang.String toString():0:0 -> toString
@@ -71013,11 +70624,11 @@
     84:84:java.lang.String toString():81:81 -> toString
     85:85:java.lang.String toString():81:81 -> toString
     82:82:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.QP:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.GP:
     java.lang.String message -> x
     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$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.RP:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.HP:
     com.android.tools.r8.graph.DexMethod invokedMethod -> x
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):207:208 -> <init>
     1:1:java.lang.String toString():0:0 -> toString
@@ -71026,13 +70637,13 @@
     221:221:java.lang.String toString():218:218 -> toString
     222:222:java.lang.String toString():218:218 -> toString
     219:219:java.lang.String toString():218:218 -> toString
-com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.v6:
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.u6:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):32:32 -> a
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():14:14 -> b
     2:2:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType(int):27:27 -> b
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.Ic:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.Hc:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicTypes -> b
     int size -> a
@@ -71045,7 +70656,7 @@
     20:20:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.top():14:14 -> a
     20:20:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):81 -> a
     21:26:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):84:89 -> a
-    27:27:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    27:27:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     27:27:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):91 -> a
     28:29:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):92:93 -> a
     30:30:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
@@ -71090,7 +70701,7 @@
     1:5:boolean equals(java.lang.Object):192:196 -> equals
     1:1:int hashCode():201:201 -> hashCode
     1:2:java.lang.String toString():206:207 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.Oe:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.Je:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -71103,7 +70714,7 @@
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():18:18 -> k
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.Ve:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.Qe:
     com.android.tools.r8.ir.analysis.value.AbstractValue UNKNOWN_ABSTRACT_RETURN_VALUE -> e
     java.util.Set UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT -> c
     com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo DEFAULT_INSTANCE -> b
@@ -71144,7 +70755,7 @@
     boolean isMultiCallerMethod() -> x
     boolean isReachabilitySensitive() -> y
     1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():166:166 -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Vj:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Qj:
     1:1:void <init>():10:10 -> <init>
     boolean cannotBeKept() -> e
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue() -> f
@@ -71152,18 +70763,18 @@
     int getReadBits() -> h
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.AB:
+com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.tB:
     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 -> c
-com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.OD:
+com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.HD:
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo() -> a
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> b
     com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo asMutableMethodOptimizationInfo() -> c
     boolean isMutableOptimizationInfo() -> d
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.EE:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.xE:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
@@ -71196,7 +70807,7 @@
     boolean isMultiCallerMethod() -> x
     boolean isReachabilitySensitive() -> y
     com.android.tools.r8.utils.OptionalBool isReturnValueUsed() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.GE:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.zE:
     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
@@ -71571,14 +71182,14 @@
     1185:1230: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):1112 -> a
     1231:1231:boolean lambda$isNonNullOnNormalExit$3(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1083:1083 -> a
     boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.FE:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.yE:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> e
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> d
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> c
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> b
     1:4:void <clinit>():671:674 -> <clinit>
     1:1:void <init>(java.lang.String,int):670:670 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.iG:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.bG:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     int flags -> b
@@ -71606,7 +71217,7 @@
     1:1:void markAsPropagated():114:114 -> l
     1:1:void markCannotBeKept():87:87 -> m
     1:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():49:53 -> n
-com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.jG:
+com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.cG:
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification enumUnboxerMethodClassification -> g
     java.util.BitSet nonNullParamOrThrow -> m
     java.util.BitSet nonNullParamOnNormalExits -> n
@@ -71781,20 +71392,20 @@
     1:1:boolean isMultiCallerMethod():480:480 -> x
     1:1:boolean isReachabilitySensitive():385:385 -> y
     1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():485:485 -> z
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.BK:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.rK:
     1:1:void <init>():20:20 -> <init>
     void modifyAppInfoWithLiveness(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple com.android.tools.r8.ir.optimize.info.OptimizationFeedback.getSimple():44:44 -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getSimpleFeedback():48 -> a
     2:2:void fixupOptimizationInfos(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):62:62 -> a
     3:3:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):63:63 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.AK:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.qK:
     void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo) -> 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.CK:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.sK:
     java.util.Map fieldOptimizationInfos -> b
     java.util.Map methodOptimizationInfos -> c
     java.util.Map processed -> d
@@ -71895,7 +71506,7 @@
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> f
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.a:
     1:1:void <init>():26:26 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.DK:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.tK:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():30:30 -> <init>
@@ -71990,12 +71601,12 @@
     1:1:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):332:332 -> v
     2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):337:338 -> v
     2:3:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):332 -> v
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.CY:
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.sY:
     com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> a
     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 -> c
-com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.T5:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.S5:
     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
@@ -72019,13 +71630,13 @@
     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.P10:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.F10:
     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.Sh:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Nh:
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():25:25 -> <init>
@@ -72037,7 +71648,7 @@
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection getInstance():28:28 -> c
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.Op:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.Hp:
     boolean $assertionsDisabled -> b
     int argumentIndex -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -72049,17 +71660,17 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> e
     boolean isArgumentInitializationInfo() -> g
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":150,"2":151,"3":152}}
-    150:150:java.lang.String toString():74:74 -> toString
-    151:151:java.lang.String toString():74:74 -> toString
-    152:152:java.lang.String toString():74:74 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77,"2":78,"3":79}}
+    77:77:java.lang.String toString():74:74 -> toString
+    78:78:java.lang.String toString():74:74 -> toString
+    79:79:java.lang.String toString():74:74 -> toString
     75:75:java.lang.String toString():74:74 -> toString
     76:76:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":153,"2":154,"3":155}}
-    153:153:java.lang.String toString():74:74 -> toString
-    154:154:java.lang.String toString():74:74 -> toString
-    155:155:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.Pp:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":77,"2":78,"3":79}}
+    77:77:java.lang.String toString():74:74 -> toString
+    78:78:java.lang.String toString():74:74 -> toString
+    79:79:java.lang.String toString():74:74 -> toString
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.Ip:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     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,com.android.tools.r8.graph.GraphLens) -> a
@@ -72067,7 +71678,7 @@
     boolean isSingleValue() -> f
     boolean isArgumentInitializationInfo() -> g
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> i
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Rp:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Kp:
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
@@ -72076,19 +71687,19 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder():28:28 -> a
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.Qp:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.Jp:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():53:53 -> <clinit>
     1:3:void <init>():53:55 -> <init>
     1:3: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):63:65 -> a
     4:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():71:74 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Sp:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Lp:
     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.Up:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.Np:
     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):27:29 -> <init>
@@ -72104,7 +71715,7 @@
     1:6:boolean equals(java.lang.Object):87:92 -> equals
     1:1:int hashCode():79:79 -> hashCode
     1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.yH:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.oH:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -72126,7 +71737,7 @@
     30:30:void lambda$toString$3(java.util.List,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):96:96 -> a
     boolean isEmpty() -> b
     1:4:java.lang.String toString():95:98 -> toString
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.D00:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.t00:
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
@@ -72134,7 +71745,7 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():24:24 -> b
     1:1:java.lang.String toString():46:46 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Td:
+com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Sd:
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo info -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo):19:20 -> <init>
     1:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):41:44 -> a
@@ -72144,7 +71755,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect):14 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.getContextInsensitive():25:25 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14 -> c
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.Se:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.Ne:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():23:23 -> <init>
@@ -72156,7 +71767,7 @@
     boolean receiverNeverEscapesOutsideConstructorChain() -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():26:26 -> h
     1:1:java.lang.String toString():86:86 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Th:
+com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Oh:
     com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection EMPTY -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -72167,7 +71778,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection.getContextInsensitive():27:27 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection getInstance():22:22 -> d
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.aq:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.Tp:
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> b
@@ -72176,7 +71787,7 @@
     boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments() -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> f
     boolean receiverNeverEscapesOutsideConstructorChain() -> g
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.bq:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.Up:
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     1:1:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.isNonTrivialInstanceInitializerInfo():0:0 -> a
@@ -72188,7 +71799,7 @@
     5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection empty():23:23 -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect) -> b
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive() -> c
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.AH:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.qH:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -72213,7 +71824,7 @@
     130:130:java.lang.String toString():127:127 -> toString
     131:131:java.lang.String toString():127:127 -> toString
     128:128:java.lang.String toString():127:127 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.zH:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.pH:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -72273,7 +71884,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():200:200 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():209:209 -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():214:214 -> h
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.Re:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.Me:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions$InlinerOptions options -> c
@@ -72310,11 +71921,11 @@
     37:37:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isMultiCallerInlineCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):93:93 -> a
     37:37: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):59 -> a
     38: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):60:64 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.uk:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.pk:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):17:18 -> <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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):28:28 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Bp:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.up:
     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
@@ -72327,7 +71938,7 @@
     9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33 -> a
     10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):36:36 -> a
     11:11: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.Dp:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.wp:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> f
@@ -72355,7 +71966,7 @@
     19: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.ir.conversion.MethodProcessor):48:48 -> b
     19:19:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):83 -> b
     1:1:boolean verifyIRCacheIsEmpty():108:108 -> c
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider$1 -> com.android.tools.r8.internal.Cp:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider$1 -> com.android.tools.r8.internal.vp:
     1:1:void <init>():44:44 -> <init>
     1:1:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
     2:2:void cacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):57:57 -> a
@@ -72363,9 +71974,9 @@
     4:4:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):72:72 -> a
     1:1:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):47:47 -> b
     boolean verifyIRCacheIsEmpty() -> c
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Fp:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.yp:
     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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.CH:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.sH:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -72402,7 +72013,7 @@
     void reportUnknownTarget() -> u
     boolean unsetReasonHasBeenReportedFlag() -> v
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():22:22 -> w
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.n20:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.d20:
     1:1:void <init>():19:19 -> <init>
     void reportCallerHasUnknownApiLevel() -> a
     void reportIncorrectArity(int,int) -> a
@@ -72438,7 +72049,7 @@
     void reportRecursiveMethod() -> t
     void reportUnknownTarget() -> u
     boolean unsetReasonHasBeenReportedFlag() -> v
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.o20:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.e20:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.ProgramMethod callee -> a
@@ -72505,23 +72116,23 @@
     1:1:void reportRecursiveMethod():227:227 -> t
     1:1:void reportUnknownTarget():232:232 -> u
     1:2:boolean unsetReasonHasBeenReportedFlag():288:289 -> v
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph -> com.android.tools.r8.internal.LF:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph -> com.android.tools.r8.internal.EF:
     1:1:void <init>(java.util.Map):16:16 -> <init>
     1:1:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder builder(com.android.tools.r8.graph.AppView):20:20 -> a
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder -> com.android.tools.r8.internal.MF:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder -> com.android.tools.r8.internal.FF:
     1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
     1:1:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder.createNode(com.android.tools.r8.graph.ProgramMethod):26:26 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):17 -> a
     2:3:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph build(java.util.concurrent.ExecutorService):31:32 -> a
     4:4:void processClass(com.android.tools.r8.graph.DexProgramClass):36:36 -> a
     1:4:void processMethod(com.android.tools.r8.graph.ProgramMethod):40:43 -> c
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerInvokeRegistry -> com.android.tools.r8.internal.NF:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerInvokeRegistry -> com.android.tools.r8.internal.GF:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode,java.util.function.Function,java.util.Map):28:28 -> <init>
     1:1:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     1:1:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):40 -> a
     2:3:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):41:42 -> a
     1:1:com.android.tools.r8.graph.GraphLens getCodeLens():33:33 -> c
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode -> com.android.tools.r8.internal.OF:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode -> com.android.tools.r8.internal.HF:
     java.util.concurrent.atomic.AtomicInteger numberOfCallSites -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -72534,7 +72145,7 @@
     5:5:void com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode.addReaderConcurrently(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode):28:28 -> a
     5:5:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):12 -> a
     1:1:int getNumberOfCallSites():32:32 -> c
-com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.x5:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.w5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):29:31 -> <init>
@@ -72563,7 +72174,7 @@
     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):101:101 -> a
     31:37:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):53 -> a
     1:1:com.android.tools.r8.graph.DexType getType():36:36 -> getType
-com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.Z5:
+com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.Y5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):25:27 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):44:44 -> a
@@ -72585,7 +72196,7 @@
     11:12:void com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer.optimizeByteValue(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):57:58 -> a
     11:12:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):45 -> a
     1:1:com.android.tools.r8.graph.DexType getType():32:32 -> getType
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.yi:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.ti:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):29:30 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):47:47 -> a
@@ -72610,7 +72221,7 @@
     30:31:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):83:84 -> a
     30:31:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):50 -> a
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
-com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.jB:
     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):29 -> a
@@ -72621,7 +72232,7 @@
     17:17:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.AppView,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.AppView,com.android.tools.r8.graph.DexField):44:44 -> a
     19:19:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):35:35 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.rB:
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.kB:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryMethodModelCollections -> d
     java.util.Set modeledLibraryTypes -> c
@@ -72658,11 +72269,11 @@
     143:143: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):177 -> a
     144:144: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):177:177 -> a
     145:145: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):160:160 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.tB:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.mB:
     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.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,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.sB:
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.xB:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.lB:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.qB:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> c
     java.util.Set unconditionalFinalMethodsWithoutSideEffects -> b
@@ -72687,7 +72298,7 @@
     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:29:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):71:97 -> 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.zB:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.sB:
     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
@@ -72751,11 +72362,11 @@
     63:63:void run(java.util.Set):50:50 -> a
     64:64:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():158:158 -> a
     64:64:void run(java.util.Set):51 -> a
-    65:65:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1555:1555 -> a
+    65:65:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1553:1553 -> a
     65:65:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():158 -> a
     65:65:void run(java.util.Set):51 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    66:66:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1555:1555 -> a
+    66:66:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1553:1553 -> a
     66:66:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():158 -> a
     66:66:void run(java.util.Set):51 -> a
     67:70:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():158:161 -> a
@@ -72772,7 +72383,7 @@
     3:3:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):167 -> b
     4:6:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):168:170 -> b
     1:3:void modelLibraryMethodsWithoutSideEffects():146:148 -> c
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.yC:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.rC:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod wtfMethod -> i
     com.android.tools.r8.graph.DexMethod eMethod -> h
@@ -72794,14 +72405,14 @@
     4:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):113:147 -> 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):154:157 -> a
     1:1:com.android.tools.r8.graph.DexType getType():101:101 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.XJ:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.NJ:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):41:41 -> 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):47:49 -> a
     2:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):42 -> a
     1:1:com.android.tools.r8.graph.DexType getType():29:29 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.pK:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.fK:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -72842,10 +72453,10 @@
     30:30:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeHashCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):139:139 -> a
     30:30:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):64 -> a
     31:31:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):90:90 -> a
-    32:32:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isToStringMethod(com.android.tools.r8.graph.DexMethod):1551:1551 -> a
+    32:32:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isToStringMethod(com.android.tools.r8.graph.DexMethod):1549:1549 -> a
     32:32:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):90 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isToStringMethod(com.android.tools.r8.graph.DexMethod):1551:1551 -> a
+    33:33:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isToStringMethod(com.android.tools.r8.graph.DexMethod):1549:1549 -> a
     33:33:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):90 -> a
     34:34:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():285:285 -> a
     34:34:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):221 -> a
@@ -72863,10 +72474,10 @@
     38:59:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeToStringWithObject(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):226:247 -> a
     38:59:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):91 -> a
     60:60:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):78:78 -> a
-    61:61:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1543:1543 -> a
+    61:61:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1541:1541 -> a
     61:61:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    62:62:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1543:1543 -> a
+    62:62:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1541:1541 -> a
     62:62:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):78 -> a
     63:63:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):180:180 -> a
     63:63:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
@@ -72920,14 +72531,14 @@
     138:138: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):122:122 -> a
     138:138:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
     1:1:com.android.tools.r8.graph.DexType getType():43:43 -> getType
-com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.dW:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.TV:
     1:1:void <init>():19:19 -> <init>
     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.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set) -> a
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):19:19 -> 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.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):48:48 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):19 -> a
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.BW:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.rW:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -72940,12 +72551,12 @@
     6:13:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):103:110 -> a
     6:13:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
     6:13:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    14:14:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendStringMethod(com.android.tools.r8.graph.DexMethod):2040:2040 -> a
+    14:14:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendStringMethod(com.android.tools.r8.graph.DexMethod):2038:2038 -> a
     14:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
     14:14:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):44 -> a
-    15:15:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):2032:2032 -> a
+    15:15:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isAppendObjectMethod(com.android.tools.r8.graph.DexMethod):2030:2030 -> a
     15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimizeAppend(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:void com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer.optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):83 -> a
@@ -73027,7 +72638,7 @@
     84:84:com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor):44 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer):44:44 -> b
     1:1:com.android.tools.r8.graph.DexType getType():66:66 -> getType
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.AW:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.qW:
     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
@@ -73044,11 +72655,11 @@
     136:143:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):179 -> a
     144:152:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):247:255 -> a
     144:152:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):179 -> a
-    153:153:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isConstructorMethod(com.android.tools.r8.graph.DexMethod):2044:2044 -> a
+    153:153:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isConstructorMethod(com.android.tools.r8.graph.DexMethod):2042:2042 -> a
     153:153:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):255 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     153:153:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):179 -> a
-    154:154:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isConstructorMethod(com.android.tools.r8.graph.DexMethod):2044:2044 -> a
+    154:154:boolean com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods.isConstructorMethod(com.android.tools.r8.graph.DexMethod):2042:2042 -> a
     154:154:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):255 -> a
     154:154:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):179 -> a
     155:155:boolean com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State.computeAllAliasesIfUnusedStringBuilder(com.android.tools.r8.ir.code.Value,java.util.Set):238:238 -> a
@@ -73056,7 +72667,7 @@
     156:156:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):180:180 -> a
     157:157:void lambda$computeIsUnusedBuilder$0(boolean,com.android.tools.r8.ir.code.Value):180:180 -> a
     1:5:boolean isUnusedBuilder(com.android.tools.r8.ir.code.Value):168:172 -> b
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.HW:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.xW:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):32:34 -> <init>
@@ -73087,7 +72698,7 @@
     52:52:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):128 -> a
     53:55:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):128:130 -> a
     1:1:com.android.tools.r8.graph.DexType getType():39:39 -> getType
-com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.qv:
+com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.jv:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:20:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):22:41 -> a
@@ -73097,7 +72708,7 @@
     22:22:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):760:760 -> a
     22:22:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):44 -> a
     23:28: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.I3:
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.H3:
     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>
@@ -73108,9 +72719,9 @@
     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.J3:
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup -> com.android.tools.r8.internal.I3:
     1:15: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.outliner.OutlineCollection -> com.android.tools.r8.internal.WK:
+com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.MK:
     java.util.Map canonicalization -> a
     java.util.Map outlines -> c
     com.android.tools.r8.graph.GraphLens appliedGraphLens -> b
@@ -73138,7 +72749,7 @@
     48:51:void lambda$computeMethodsPerOutline$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):100:103 -> a
     52:61:void lambda$computeMethodsPerOutline$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):102:111 -> a
     1:5:com.android.tools.r8.utils.collections.ProgramMethodSet computeMethodsSubjectToOutlining(com.android.tools.r8.graph.AppView):84:88 -> b
-com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.ZK:
+com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.PK:
     1:1:void <init>():19:19 -> <init>
     void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -73150,7 +72761,7 @@
     3:3:com.android.tools.r8.ir.optimize.outliner.Outliner empty():26:26 -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
     void rewriteWithLens() -> b
-com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.YK:
+com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.OK:
     1:1:void <init>():26:26 -> <init>
     void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -73158,7 +72769,7 @@
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens) -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
     void rewriteWithLens() -> b
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.F4:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.E4:
     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
@@ -73174,10 +72785,10 @@
     30:42:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):67:79 -> a
     43:43:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():11:11 -> a
     43:43: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.G4:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.F4:
     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.Dh:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.yh:
     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
@@ -73201,7 +72812,7 @@
     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.oC:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.hC:
     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
@@ -73212,10 +72823,10 @@
     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):42:42 -> 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.MD:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.FD:
     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.AF:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.tF:
     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
@@ -73248,11 +72859,11 @@
     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.DL:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.tL:
     java.util.function.Predicate getPredicate() -> a
     int getMin() -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.EL:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.uL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -73263,7 +72874,7 @@
     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.FL:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.vL:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -73272,7 +72883,7 @@
     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.OL:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.EL:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -73284,7 +72895,7 @@
     int getMin() -> b
     int getMax() -> c
     1:2:void setIndex(int):36:37 -> setIndex
-com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.pS:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.fS:
     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
@@ -73294,14 +72905,14 @@
     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.qW:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.gW:
     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.rW:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.hW:
     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
@@ -73320,7 +72931,7 @@
     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.sW:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.iW:
     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
@@ -73346,7 +72957,7 @@
     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.s20:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.i20:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -73485,7 +73096,7 @@
     1:1:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer):822:822 -> <init>
     1:2:boolean isBuilderType(com.android.tools.r8.graph.DexType):826:827 -> a
     3:4:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):832:833 -> a
-    5:5:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2856:2856 -> a
+    5:5:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2854:2854 -> a
     5:5:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):833 -> a
     6:8:boolean isBuilderInitWithInitialValue(com.android.tools.r8.ir.code.InvokeMethod):844:846 -> a
     9:10:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):851:852 -> a
@@ -73493,7 +73104,7 @@
     30:30:boolean canHandleArgumentType(com.android.tools.r8.graph.DexType):891:891 -> a
     30:30:boolean isSupportedAppendMethod(com.android.tools.r8.ir.code.InvokeMethod):876 -> a
     1:2:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod):838:839 -> b
-    3:3:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2856:2856 -> b
+    3:3:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2854:2854 -> b
     3:3:boolean isBuilderInit(com.android.tools.r8.graph.DexMethod):839 -> b
     1:4:boolean isToStringMethod(com.android.tools.r8.graph.DexMethod):883:886 -> c
 com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringBuilderOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.ir.optimize.string.g:
@@ -73622,7 +73233,7 @@
     125:125:void removeTrivialBuilders():816 -> b
     126:128:void removeTrivialBuilders():816:818 -> b
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):316:316 -> c
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.JW:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.zW:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -73686,10 +73297,10 @@
     214:214:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1042:1042 -> a
     214:214:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):302 -> a
     215:222:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):303:310 -> a
-    223:223:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    223:223:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     223:223:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    224:224:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    224:224:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     224:224:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):310 -> a
     225:244:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):314:333 -> a
     245:245:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
@@ -73751,13 +73362,13 @@
     2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229 -> i
     3:3:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.IW:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.yW:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():574:574 -> <clinit>
     1:1:void <init>():577:577 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():580:580 -> 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):589:609 -> a
-com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.U8:
+com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.T8:
     1:4:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):35:38 -> a
     5:25:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):44:64 -> a
     26:36:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):61:71 -> a
@@ -73765,13 +73376,13 @@
     37:37:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):71 -> a
     38:39:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):71:72 -> a
     40:64:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):52:76 -> a
-    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    65:65:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     65:65:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):76 -> a
-    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    66:66:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     66:66:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):76 -> a
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    67:67:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     67:67:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):76 -> a
     1:20:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):151:170 -> b
     21:31:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):167:177 -> b
@@ -73779,15 +73390,15 @@
     32:32:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):177 -> b
     33:34:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):177:178 -> b
     35:58:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):159:182 -> b
-    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> b
+    59:59:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> b
     59:59:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):182 -> b
-    60:60:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> b
-    60:60:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b
+    60:60:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> b
+    60:60:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b
     60:60:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):182 -> b
-    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> b
-    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> b
+    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> b
+    61:61:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> b
     61:61:com.android.tools.r8.graph.CfCode CfUtilityMethodsForCodeOptimizationsTemplates_toStringIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):182 -> b
-com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.r9:
+com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.q9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> d
     com.android.tools.r8.utils.collections.SortedProgramMethodSet candidatesForInstanceOfOptimization -> c
@@ -74057,11 +73668,11 @@
     2917:2925: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):2400:2408 -> a
     2926:2926: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):2407:2407 -> a
     2927:2962: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):2516:2551 -> a
-    2963:2963:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    2963:2963:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     2963:2963:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2963:2963: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):2551 -> a
-    2964:2964:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    2964:2964:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     2964:2964:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
     2964:2964: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):2551 -> a
     2965:2971: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):2551:2557 -> a
@@ -74083,17 +73694,17 @@
     2992:2992:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2615 -> a
     2993:3020:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2616:2643 -> a
     3021:3027:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640:2646 -> a
-    3028:3028:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    3028:3028:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     3028:3028:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3029:3029:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    3029:3029:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     3029:3029:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646 -> a
     3030:3037:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646:2653 -> a
-    3038:3038:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    3038:3038:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     3038:3038:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3038:3038:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653 -> a
-    3039:3039:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    3039:3039:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     3039:3039:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
     3039:3039:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653 -> a
     3040:3077:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653:2690 -> a
@@ -74699,7 +74310,7 @@
     6:6:boolean isRematerializable():116:116 -> z
     6:6:boolean isSpilledAndRematerializable():128 -> z
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.dC:
     int position -> b
     int limit -> c
     1:3:void <init>(int,int):12:14 -> <init>
@@ -74711,7 +74322,7 @@
     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.mC:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.fC:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> d
     int start -> b
     int end -> c
@@ -74721,17 +74332,17 @@
     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():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":58,"2":59,"3":60}}
-    58:58:java.lang.String toString():28:28 -> toString
-    59:59:java.lang.String toString():28:28 -> toString
-    60:60:java.lang.String toString():28:28 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33}}
+    31:31:java.lang.String toString():28:28 -> toString
+    32:32:java.lang.String toString():28:28 -> toString
+    33:33:java.lang.String toString():28:28 -> toString
     29:29:java.lang.String toString():28:28 -> toString
     30:30:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":61,"2":62,"3":63}}
-    61:61:java.lang.String toString():28:28 -> toString
-    62:62:java.lang.String toString():28:28 -> toString
-    63:63:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.ZR:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33}}
+    31:31:java.lang.String toString():28:28 -> toString
+    32:32:java.lang.String toString():28:28 -> toString
+    33:33:java.lang.String toString():28:28 -> toString
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.PR:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     void allocateRegisters() -> a
     int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
@@ -74740,7 +74351,7 @@
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     int registersUsed() -> b
     com.android.tools.r8.utils.InternalOptions options() -> c
-com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.aS:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.QR:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> b
     com.android.tools.r8.ir.code.Instruction definition -> e
     boolean $assertionsDisabled -> f
@@ -74760,7 +74371,7 @@
     2:28:int compareTo(java.lang.Object):13 -> compareTo
     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.bS:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.RR:
     java.util.Map valueMap -> b
     int tempRegister -> f
     java.util.Set moveSet -> a
@@ -74953,7 +74564,6 @@
     44:44:java.util.Set lambda$scheduleMovesBeforeInstruction$5(java.lang.Integer):310:310 -> f
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode -> com.android.tools.r8.internal.r1:
     1:1:void <init>():26:26 -> <init>
-    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> A0
     java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod) -> a
     1:2: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):43:44 -> a
     3:3: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.graph.GraphLens,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.proto.RewrittenPrototypeDescription):61:61 -> a
@@ -74968,26 +74578,27 @@
     int estimatedDexCodeSizeUpperBoundInBytes() -> q0
     1:1:java.lang.String com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode.toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):99:99 -> toString
     1:1:java.lang.String toString():70 -> toString
+    com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> z0
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.internal.q1:
     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.r6:
+com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.q6:
     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 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.Hf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.Cf:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):63:63 -> <init>
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APICallbackWrapperCfCodeProvider -> com.android.tools.r8.internal.yf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APICallbackWrapperCfCodeProvider -> com.android.tools.r8.internal.tf:
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.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.apiconversion.DesugaredLibraryWrapperSynthesizer,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):236:237 -> <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):247:247 -> a
     1:1:void generatePushReceiver(java.util.List):242:242 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConversionCfCodeProvider -> com.android.tools.r8.internal.zf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConversionCfCodeProvider -> com.android.tools.r8.internal.uf:
     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[]):352:355 -> <init>
     1:29:com.android.tools.r8.graph.CfCode generateCfCode():360:388 -> b
     30:43:com.android.tools.r8.graph.CfCode generateCfCode():387:400 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.Af:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.vf:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):562:563 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():568:576 -> b
@@ -74996,7 +74607,7 @@
     22:22:void com.android.tools.r8.cf.code.CfInstanceFieldWrite.<init>(com.android.tools.r8.graph.DexField):16:16 -> b
     22:22:com.android.tools.r8.graph.CfCode generateCfCode():581 -> b
     23:25:com.android.tools.r8.graph.CfCode generateCfCode():581:583 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.Bf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.wf:
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
     com.android.tools.r8.graph.DexMethod forwardMethod -> d
@@ -75028,7 +74639,7 @@
     48:48:com.android.tools.r8.graph.CfCode generateCfCode():142 -> b
     49:49:com.android.tools.r8.graph.CfCode generateCfCode():141:141 -> b
     50:62:com.android.tools.r8.graph.CfCode generateCfCode():138:150 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Cf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.xf:
     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.apiconversion.DesugaredLibraryWrapperSynthesizer,boolean):262:263 -> <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):274:274 -> a
@@ -75036,7 +74647,7 @@
     3:3:void com.android.tools.r8.cf.code.CfInstanceFieldRead.<init>(com.android.tools.r8.graph.DexField):17:17 -> b
     3:3:void generatePushReceiver(java.util.List):269 -> b
     4:4:void generatePushReceiver(java.util.List):269:269 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.Df:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.yf:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexField wrapperField -> d
     com.android.tools.r8.graph.DexField reverseWrapperField -> c
@@ -75046,7 +74657,7 @@
     5:5:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> b
     5:5:com.android.tools.r8.graph.CfCode generateCfCode():297 -> b
     6:25:com.android.tools.r8.graph.CfCode generateCfCode():298:317 -> b
-    26:26:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> b
+    26:26:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> b
     26:26:com.android.tools.r8.graph.CfCode generateCfCode():317 -> b
     27:28:com.android.tools.r8.graph.CfCode generateCfCode():317:318 -> b
     29:29:void com.android.tools.r8.cf.code.CfInstanceFieldRead.<init>(com.android.tools.r8.graph.DexField):17:17 -> b
@@ -75054,7 +74665,7 @@
     30:44:com.android.tools.r8.graph.CfCode generateCfCode():318:332 -> b
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():330:330 -> b
     46:55:com.android.tools.r8.graph.CfCode generateCfCode():327:336 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AbstractAPIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$AbstractAPIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.zf:
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> d
     boolean itfCall -> e
     com.android.tools.r8.graph.DexMethod forwardMethod -> c
@@ -75081,7 +74692,7 @@
     40:40:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):67:67 -> b
     40:40:com.android.tools.r8.graph.CfCode generateCfCode():214 -> b
     41:46:com.android.tools.r8.graph.CfCode generateCfCode():216:221 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumArrayConversionCfCodeProvider -> com.android.tools.r8.internal.Ff:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumArrayConversionCfCodeProvider -> com.android.tools.r8.internal.Af:
     com.android.tools.r8.graph.DexType convertedType -> d
     com.android.tools.r8.graph.DexType enumType -> c
     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.graph.DexType):411:413 -> <init>
@@ -75095,7 +74706,7 @@
     21:57:com.android.tools.r8.graph.CfCode generateCfCode():440:476 -> b
     58:58:com.android.tools.r8.graph.CfCode generateCfCode():474:474 -> b
     59:79:com.android.tools.r8.graph.CfCode generateCfCode():471:491 -> b
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.Gf:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.Bf:
     com.android.tools.r8.graph.DexType enumType -> d
     java.lang.Iterable enumFields -> c
     com.android.tools.r8.graph.DexType convertedType -> e
@@ -75106,7 +74717,7 @@
     4:26:com.android.tools.r8.graph.CfCode generateCfCode():519:541 -> b
     27:33:com.android.tools.r8.graph.CfCode generateCfCode():540:546 -> b
     34:43:com.android.tools.r8.graph.CfCode generateCfCode():544:553 -> b
-com.android.tools.r8.ir.synthetic.EmulateDispatchSyntheticCfCodeProvider -> com.android.tools.r8.internal.ai:
+com.android.tools.r8.ir.synthetic.EmulateDispatchSyntheticCfCodeProvider -> com.android.tools.r8.internal.Vh:
     java.util.LinkedHashMap extraDispatchCases -> e
     com.android.tools.r8.graph.DexMethod interfaceMethod -> d
     com.android.tools.r8.graph.DexMethod forwardingMethod -> c
@@ -75115,15 +74726,15 @@
     6:6:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> b
     6:6:com.android.tools.r8.graph.CfCode generateCfCode():61 -> b
     7:20:com.android.tools.r8.graph.CfCode generateCfCode():62:75 -> b
-    21:21:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> b
+    21:21:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> b
     21:21:com.android.tools.r8.graph.CfCode generateCfCode():75 -> b
     22:38:com.android.tools.r8.graph.CfCode generateCfCode():75:91 -> b
-    39:39:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> b
+    39:39:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> b
     39:39:com.android.tools.r8.graph.CfCode generateCfCode():91 -> b
     40:53:com.android.tools.r8.graph.CfCode generateCfCode():91:104 -> b
     54:57:void addReturn(java.util.List):115:118 -> b
     1:2:void loadExtraParameters(java.util.List):109:110 -> c
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.Ji:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.Ei:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):46:46 -> <init>
@@ -75132,7 +74743,7 @@
     4:4:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):56 -> a
     5:8:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):57:57 -> a
     12:12:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):61:61 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.Hi:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.Ci:
     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
@@ -75142,7 +74753,7 @@
     3:3:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> b
     3:3:com.android.tools.r8.graph.CfCode generateCfCode():101 -> b
     4:32:com.android.tools.r8.graph.CfCode generateCfCode():101:129 -> b
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.Ii:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.Di:
     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):143:145 -> <init>
@@ -75159,7 +74770,7 @@
     244:246:com.android.tools.r8.graph.CfCode generateCfCode():200:202 -> b
     247:247:com.android.tools.r8.graph.CfCode generateCfCode():201:201 -> b
     248:262:com.android.tools.r8.graph.CfCode generateCfCode():197:211 -> b
-com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.Cj:
+com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.xj:
     com.android.tools.r8.utils.OptionalBool isSetter -> c
     com.android.tools.r8.utils.OptionalBool isInstanceField -> b
     boolean $assertionsDisabled -> e
@@ -75190,46 +74801,46 @@
     23:23:boolean com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.isSetter():129:129 -> a
     23:23:com.android.tools.r8.graph.CfCode build():105 -> a
     24:25:com.android.tools.r8.graph.CfCode build():105:106 -> a
-    26:26:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
+    26:26:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
     26:26:com.android.tools.r8.graph.CfCode build():106 -> a
     27:27:com.android.tools.r8.graph.CfCode build():0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":52,"2":53,"3":54,"4":55,"5":56}}
-    52:52:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
+    52:52:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
     52:52:com.android.tools.r8.graph.CfCode build():106 -> a
-    53:53:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
+    53:53:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
     53:53:com.android.tools.r8.graph.CfCode build():106 -> a
-    54:54:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
+    54:54:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
     54:54:com.android.tools.r8.graph.CfCode build():106 -> a
-    55:55:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
+    55:55:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
     55:55:com.android.tools.r8.graph.CfCode build():106 -> a
-    56:56:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
+    56:56:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
     56:56:com.android.tools.r8.graph.CfCode build():106 -> a
-    28:28:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):65:65 -> a
+    28:28:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):64:64 -> a
     28:28:com.android.tools.r8.graph.CfCode build():106 -> a
-    29:29:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):63:63 -> a
+    29:29:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):62:62 -> a
     29:29:com.android.tools.r8.graph.CfCode build():106 -> a
-    30:30:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):61:61 -> a
+    30:30:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):60:60 -> a
     30:30:com.android.tools.r8.graph.CfCode build():106 -> a
-    31:31:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):59:59 -> a
+    31:31:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):58:58 -> a
     31:31:com.android.tools.r8.graph.CfCode build():106 -> a
-    32:32:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):57:57 -> a
+    32:32:com.android.tools.r8.cf.code.CfFieldInstruction com.android.tools.r8.cf.code.CfFieldInstruction.create(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):56:56 -> a
     32:32:com.android.tools.r8.graph.CfCode build():106 -> a
     33:33:com.android.tools.r8.graph.CfCode build():106:106 -> a
     34:34:boolean com.android.tools.r8.ir.synthetic.FieldAccessorBuilder.isSetter():129:129 -> a
     34:34:com.android.tools.r8.graph.CfCode build():109 -> a
     35:48:com.android.tools.r8.graph.CfCode build():110:123 -> a
-    49:49:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    49:49:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     49:49:com.android.tools.r8.graph.CfCode build():123 -> a
-    50:50:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    50:50:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    50:50:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    50:50:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     50:50:com.android.tools.r8.graph.CfCode build():123 -> a
-    51:51:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    51:51:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    51:51:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    51:51:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     51:51:com.android.tools.r8.graph.CfCode build():123 -> a
     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.Uk:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.Pk:
     java.lang.Boolean isInterface -> g
     boolean isConstructorDelegate -> i
     boolean $assertionsDisabled -> k
@@ -75309,7 +74920,7 @@
     89:89:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isSourceReturnVoid():258:258 -> a
     89:89:com.android.tools.r8.graph.CfCode build():195 -> a
     90:96:com.android.tools.r8.graph.CfCode build():196:202 -> a
-    97:97:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    97:97:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     97:97:com.android.tools.r8.graph.CfCode build():202 -> a
     98:101:com.android.tools.r8.graph.CfCode build():202:205 -> a
     102:102:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceReturnType():262:262 -> a
@@ -75320,13 +74931,13 @@
     104:105:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.getSourceReturnType():262:263 -> a
     104:105:com.android.tools.r8.graph.CfCode build():205 -> a
     106:114:com.android.tools.r8.graph.CfCode build():205:213 -> a
-    115:115:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
+    115:115:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
     115:115:com.android.tools.r8.graph.CfCode build():213 -> a
-    116:116:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    116:116:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    116:116:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    116:116:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     116:116:com.android.tools.r8.graph.CfCode build():213 -> a
-    117:117:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    117:117:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
+    117:117:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    117:117:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
     117:117:com.android.tools.r8.graph.CfCode build():213 -> a
     121:121:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):220:220 -> a
     122:122:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticSource():267:267 -> a
@@ -75334,7 +74945,7 @@
     123:123:boolean com.android.tools.r8.ir.synthetic.ForwardMethodBuilder.isStaticTarget():271:271 -> a
     123:123:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):224 -> a
     124:129:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):230:235 -> a
-    130:130:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):37:37 -> a
+    130:130:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):36:36 -> a
     130:130:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):235 -> a
     131:131:void maybeInsertArgumentCast(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):235:235 -> a
     1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setNonStaticSourceWithExtraUnusedParameter(com.android.tools.r8.graph.DexMethod):91:93 -> b
@@ -75343,12 +74954,12 @@
     1:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticSource(com.android.tools.r8.graph.DexMethod):98:99 -> c
     3:5:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setSuperTarget(com.android.tools.r8.graph.DexMethod,boolean):111:113 -> c
     1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):118:120 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Tk:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Ok:
 # {"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.Wk:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.Rk:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -75379,7 +74990,7 @@
     29:29:void com.android.tools.r8.ir.synthetic.SyntheticSourceCode.add(java.util.function.Consumer):77:77 -> i
     29:29:void prepareInstructions():215 -> i
     1:27:boolean checkSignatures():147:173 -> j
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.Vk:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.Qk:
     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
@@ -75395,13 +75006,13 @@
     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.TP:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.JP:
     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):146:147 -> <init>
     1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.builder():38:38 -> b
     1:1:com.android.tools.r8.graph.CfCode generateCfCode():165 -> b
     2:28:com.android.tools.r8.graph.CfCode generateCfCode():166:192 -> b
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.UP:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.KP:
     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[]):69:70 -> <init>
     1:2:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):57:58 -> a
@@ -75419,18 +75030,18 @@
     4:12:com.android.tools.r8.graph.CfCode generateCfCode():81 -> b
     13:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider.generateCfCodeWithArray():86:103 -> b
     13:30:com.android.tools.r8.graph.CfCode generateCfCode():82 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.IX:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.yX:
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> d
     1:2:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):15:16 -> <init>
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():21:21 -> A0
     java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod) -> a
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.LX:
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():21:21 -> z0
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.BX:
     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):18:20 -> <init>
     1:1:com.android.tools.r8.graph.DexType getHolder():24:24 -> a
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):30:30 -> a
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.WX:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.MX:
     com.android.tools.r8.ir.code.Position position -> h
     java.util.function.Predicate endsBlock -> j
     java.util.List constructors -> f
@@ -75478,7 +75089,7 @@
     1:3:int getParamRegister(int):98:100 -> h
     4:4:int nextInstructionIndex():115:115 -> h
     void prepareInstructions() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.Arrays -> com.android.tools.r8.internal.s3:
+com.android.tools.r8.it.unimi.dsi.fastutil.Arrays -> com.android.tools.r8.internal.r3:
     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
@@ -75491,12 +75102,12 @@
     64:64:void ensureFromTo(int,int,int):55:55 -> a
     65:65:void ensureFromTo(int,int,int):55:55 -> a
     59:59:void ensureFromTo(int,int,int):55:55 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.ql:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.ll:
 # {"id":"sourceFile","fileName":"Function.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.mm:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.hm:
     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.Cm:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.xm:
     int long2int(long) -> a
     int mix(int) -> a
     1:2:int arraySize(int,float):228:229 -> a
@@ -75547,7 +75158,7 @@
     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.k5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.j5:
     boolean[] a -> b
     int size -> c
     1:4:void <init>(boolean[],int):104:107 -> <init>
@@ -75560,10 +75171,10 @@
     225:225:void <init>(boolean[],int):107:107 -> <init>
     112:112:void <init>(boolean[],int):107:107 -> <init>
     113:113:void <init>(boolean[],int):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226,"2":227,"3":228}}
-    226:226:void <init>(boolean[],int):107:107 -> <init>
-    227:227:void <init>(boolean[],int):107:107 -> <init>
-    228:228:void <init>(boolean[],int):107:107 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":221,"2":222,"3":223}}
+    221:221:void <init>(boolean[],int):107:107 -> <init>
+    222:222:void <init>(boolean[],int):107:107 -> <init>
+    223:223:void <init>(boolean[],int):107:107 -> <init>
     220:220:void <init>(boolean[],int):107:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):29:29 -> a
     2:3:int com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet.findKey(boolean):111:112 -> a
@@ -75586,20 +75197,20 @@
     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.j5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.i5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet this$0 -> c
     int next -> b
     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.l5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.k5:
     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.n5:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.q5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.m5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.p5:
     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.o5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.n5:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     boolean contains(boolean) -> b
@@ -75610,7 +75221,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.p5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.o5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> b
     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
@@ -75634,17 +75245,17 @@
     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.r5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.q5:
     boolean nextBoolean() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.v5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.u5:
     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.s5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.r5:
     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 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.t5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.s5:
     boolean element -> b
     int curr -> c
     1:2:void <init>(boolean):110:111 -> <init>
@@ -75654,21 +75265,21 @@
     1:4:boolean previousBoolean():133:133 -> j
     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.u5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.t5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> b
     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.BooleanSets -> com.android.tools.r8.internal.B5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.A5:
     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.z5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.y5:
     1:1:void <init>():42:42 -> <init>
     1:1:boolean rem(boolean):64:64 -> 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.A5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.z5:
     boolean element -> b
     1:2:void <init>(boolean):89:90 -> <init>
     1:1:boolean addAll(java.util.Collection):115:115 -> addAll
@@ -75963,7 +75574,38 @@
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(java.lang.Integer):114:114 -> a
     2:3:int[] toArray(int[]):148:149 -> a
-    4:5:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
+    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
+    4:4:int[] toArray(int[]):149 -> a
+    5:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:289 -> a
+    5:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    5:9:int[] toArray(int[]):149 -> a
+    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    10:10:int[] toArray(int[]):149 -> a
+    11:11:int[] toArray(int[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":13,"2":14,"3":15,"4":16,"5":17,"6":18}}
+    13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    13:13:int[] toArray(int[]):149 -> a
+    14:14:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    14:14:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    14:14:int[] toArray(int[]):149 -> a
+    15:15:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    15:15:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    15:15:int[] toArray(int[]):149 -> a
+    16:16:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    16:16:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    16:16:int[] toArray(int[]):149 -> a
+    17:17:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    17:17:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    17:17:int[] toArray(int[]):149 -> a
+    18:18:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    18:18:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    18:18:int[] toArray(int[]):149 -> a
+    12:12:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
+    12:12:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
+    12:12:int[] toArray(int[]):149 -> a
+    19:20:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):173:174 -> a
     1:1:boolean add(java.lang.Object):36:36 -> add
     2:2:boolean add(int):68:68 -> add
     1:1:boolean contains(java.lang.Object):129:129 -> contains
@@ -76031,13 +75673,13 @@
     49:49:void ensureIndex(int):47:47 -> i
     50:50:void ensureIndex(int):46:46 -> i
     51:51:void ensureIndex(int):0:0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":103,"2":104,"3":105,"4":106,"5":107,"6":108}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100,"4":101,"5":102,"6":103}}
+    98:98:void ensureIndex(int):46:46 -> i
+    99:99:void ensureIndex(int):46:46 -> i
+    100:100:void ensureIndex(int):46:46 -> i
+    101:101:void ensureIndex(int):46:46 -> i
+    102:102:void ensureIndex(int):46:46 -> i
     103:103:void ensureIndex(int):46:46 -> i
-    104:104:void ensureIndex(int):46:46 -> i
-    105:105:void ensureIndex(int):46:46 -> i
-    106:106:void ensureIndex(int):46:46 -> i
-    107:107:void ensureIndex(int):46:46 -> i
-    108:108:void ensureIndex(int):46:46 -> i
     97:97:void ensureIndex(int):46:46 -> i
     1:1:int indexOf(java.lang.Object):620:620 -> indexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> iterator
@@ -76059,13 +75701,13 @@
     64:64:void ensureRestrictedIndex(int):62:62 -> j
     65:65:void ensureRestrictedIndex(int):61:61 -> j
     66:66:void ensureRestrictedIndex(int):0:0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":133,"2":134,"3":135,"4":136,"5":137,"6":138}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":128,"2":129,"3":130,"4":131,"5":132,"6":133}}
+    128:128:void ensureRestrictedIndex(int):61:61 -> j
+    129:129:void ensureRestrictedIndex(int):61:61 -> j
+    130:130:void ensureRestrictedIndex(int):61:61 -> j
+    131:131:void ensureRestrictedIndex(int):61:61 -> j
+    132:132:void ensureRestrictedIndex(int):61:61 -> j
     133:133:void ensureRestrictedIndex(int):61:61 -> j
-    134:134:void ensureRestrictedIndex(int):61:61 -> j
-    135:135:void ensureRestrictedIndex(int):61:61 -> j
-    136:136:void ensureRestrictedIndex(int):61:61 -> j
-    137:137:void ensureRestrictedIndex(int):61:61 -> j
-    138:138:void ensureRestrictedIndex(int):61:61 -> j
     127:127:void ensureRestrictedIndex(int):61:61 -> j
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.listIterator():192:192 -> k
     1:1:int indexOf(int):279 -> k
@@ -76190,7 +75832,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):22:22 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet.tailSet(java.lang.Integer):68:68 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):22 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.xq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.qq:
     int[] key -> c
     int[] value -> d
     int size -> e
@@ -76230,7 +75872,7 @@
     4:9:int remove(int):305:310 -> remove
     1:1:int size():251:251 -> size
     1:1:java.util.Collection values():37:37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.wq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.pq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> b
     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>
@@ -76240,7 +75882,7 @@
     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.vq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.oq:
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> d
@@ -76249,10 +75891,10 @@
     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.yq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.rq:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Hq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Aq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> n
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -76318,14 +75960,14 @@
     1:1:int size():776:776 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.values():1629:1650 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.zq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.sq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1629:1629 -> <init>
     1:1:void clear():1647:1647 -> clear
     1:1:boolean contains(int):1642:1642 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1632:1632 -> iterator
     1:1:int size():1637:1637 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Aq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.tq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1229:1229 -> <init>
@@ -76340,7 +75982,7 @@
     1:1:void set(java.lang.Object):1226:1226 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):1218:1218 -> set
     2:2:void set(java.lang.Object):1226 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Bq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.uq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1482:1483 -> <init>
     1:1:void add(java.lang.Object):1444:1444 -> add
@@ -76355,7 +75997,7 @@
     1:1:void set(java.lang.Object):1444:1444 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator.set(java.lang.Integer):1473:1473 -> set
     2:2:void set(java.lang.Object):1444 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.vq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1498:1498 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):1498:1498 -> <init>
@@ -76374,7 +76016,7 @@
     3:3:java.util.Iterator iterator():1498 -> iterator
     1:3:int lastInt():1537:1537 -> p
     1:1:int size():1509:1509 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Dq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.wq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,int):820:821 -> <init>
@@ -76395,7 +76037,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):877:877 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):815 -> setValue
     1:1:java.lang.String toString():895:895 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Eq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.xq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1276:1276 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):1276:1276 -> <init>
@@ -76417,7 +76059,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1276:1276 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):1298:1298 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1276 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Fq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.yq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -76435,7 +76077,7 @@
     1:2:int previousIndex():1130:1131 -> previousIndex
     1:46:void remove():1153:1198 -> remove
     47:47:void remove():1154:1154 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Gq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.zq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1611:1612 -> <init>
     1:1:void add(java.lang.Object):1577:1577 -> add
@@ -76450,12 +76092,12 @@
     1:1:void set(java.lang.Object):1577:1577 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1592:1592 -> set
     2:2:void set(java.lang.Object):1577 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.Kq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.Dq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Iq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Bq:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.Jq:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Tq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Mq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> j
     int[] key -> c
@@ -76521,14 +76163,14 @@
     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.Lq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.Eq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     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 -> f
     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.Mq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Fq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):664:664 -> <init>
@@ -76536,13 +76178,13 @@
     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.Nq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Gq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     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
     1:1:int nextInt():793:793 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Oq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Hq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     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>
@@ -76551,7 +76193,7 @@
     1:3:boolean remove(int):821:823 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Pq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Iq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -76572,7 +76214,7 @@
     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.Qq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Jq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     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>
@@ -76581,7 +76223,7 @@
     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.Rq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Kq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
@@ -76600,14 +76242,14 @@
     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.Sq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Lq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     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
     1:1:int nextInt():854:854 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Uq:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap -> com.android.tools.r8.internal.Xq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Nq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap -> com.android.tools.r8.internal.Qq:
     java.lang.Object[] value -> d
     int[] key -> c
     int size -> e
@@ -76642,7 +76284,7 @@
     4:10:java.lang.Object remove(int):309:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet -> com.android.tools.r8.internal.Wq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet -> com.android.tools.r8.internal.Pq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$1):133:133 -> <init>
@@ -76652,7 +76294,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Vq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Oq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -76661,15 +76303,15 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$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.Int2ObjectFunction -> com.android.tools.r8.internal.Yq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunction -> com.android.tools.r8.internal.Rq:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.internal.br:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.internal.Uq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.Sq:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.ar:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.kr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.Tq:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.dr:
     java.lang.Object[] value -> d
     int[] key -> c
     int maxFill -> h
@@ -76732,14 +76374,14 @@
     7:17:java.lang.Object remove(int):310:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.cr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.Vq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     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.dr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Wq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):600:600 -> <init>
@@ -76747,13 +76389,13 @@
     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.er:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Xq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):721:722 -> <init>
     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
     1:1:int nextInt():727:727 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.fr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.Yq:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     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>
@@ -76762,7 +76404,7 @@
     1:3:boolean remove(int):755:757 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.gr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.Zq:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):430:431 -> <init>
@@ -76774,7 +76416,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.hr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ar:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     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>
@@ -76783,7 +76425,7 @@
     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.ir:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.br:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -76802,11 +76444,11 @@
     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.jr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.cr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
     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.Int2ObjectRBTreeMap -> com.android.tools.r8.internal.Cr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap -> com.android.tools.r8.internal.vr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     boolean modified -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry tree -> c
@@ -76924,7 +76566,7 @@
     262:263:java.lang.Object remove(int):472:473 -> remove
     1:1:int size():951:951 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.mr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.fr:
     java.util.Comparator comparator -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1127:1128 -> <init>
@@ -76947,20 +76589,20 @@
     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.Int2ObjectRBTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1202:1202 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1127 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1 -> com.android.tools.r8.internal.lr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1 -> com.android.tools.r8.internal.er:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$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.Int2ObjectRBTreeMap$3 -> com.android.tools.r8.internal.nr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3 -> com.android.tools.r8.internal.gr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):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.Int2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.or:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.hr:
     int info -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry left -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry right -> e
@@ -76981,7 +76623,7 @@
     1:1:int hashCode():919:919 -> hashCode
     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.Int2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.ir:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):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.Int2ObjectRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1121:1121 -> add
@@ -76993,7 +76635,7 @@
     1:1:void set(java.lang.Object):1096:1096 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1116:1116 -> set
     2:2:void set(java.lang.Object):1096 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.qr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.jr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):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.Int2ObjectRBTreeMap$KeyIterator.add(java.lang.Integer):1267:1267 -> add
@@ -77007,12 +76649,12 @@
     1:1:void set(java.lang.Object):1218:1218 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.rr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.kr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.zr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.sr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     boolean bottom -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> i
@@ -77068,7 +76710,7 @@
     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.ObjectCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.sr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.lr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -77101,19 +76743,19 @@
     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.Int2ObjectRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1542:1542 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.tr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.mr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.ur:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.nr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.vr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.or:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1797:1797 -> add
@@ -77125,7 +76767,7 @@
     1:1:void set(java.lang.Object):1772:1772 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1792:1792 -> set
     2:2:void set(java.lang.Object):1772 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.wr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.pr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1742:1743 -> <init>
     1:1:void updateNext():1767:1767 -> l
@@ -77136,7 +76778,7 @@
     3:4:void updateNext():1767 -> l
     5:6:void updateNext():1767:1768 -> l
     1:2:void updatePrevious():1762:1763 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.qr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1861:1861 -> add
@@ -77150,14 +76792,14 @@
     1:1:void set(java.lang.Object):1811:1811 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.rr:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Ar:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.tr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry prev -> b
@@ -77180,14 +76822,14 @@
     1:1:int nextIndex():1054:1054 -> nextIndex
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Br:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.ur:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Vr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Or:
     java.util.Comparator storedComparator -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry -> e
@@ -77369,13 +77011,13 @@
     208:208:java.lang.Object remove(int):497: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.Dr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.wr:
     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):102:102 -> <init>
     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.Fr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.yr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1161:1162 -> <init>
@@ -77398,7 +77040,7 @@
     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.Er:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.xr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> b
     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
@@ -77411,14 +77053,14 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(int,int):104:104 -> compare
     4:4: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 -> compare
     4:4: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.Gr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.zr:
     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):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.Hr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.Ar:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> d
     int info -> f
@@ -77439,7 +77081,7 @@
     1:1:int hashCode():953:953 -> hashCode
     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.Ir:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Br:
     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
@@ -77451,7 +77093,7 @@
     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.Jr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.Cr:
     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
@@ -77465,12 +77107,12 @@
     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.Kr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.Dr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> c
     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.Sr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Lr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
@@ -77545,7 +77187,7 @@
     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.Lr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.Er:
     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):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -77578,19 +77220,19 @@
     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.Mr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Fr:
     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):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.Nr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Gr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> c
     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.Or:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Hr:
     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
@@ -77602,7 +77244,7 @@
     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.Pr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Ir:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
     1:1:void updateNext():1802:1802 -> l
@@ -77613,7 +77255,7 @@
     3:4:void updateNext():1802 -> l
     5:6:void updateNext():1802:1803 -> l
     1:2:void updatePrevious():1797:1798 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Qr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Jr:
     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
@@ -77627,14 +77269,14 @@
     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.Rr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Kr:
     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.Tr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Mr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next -> c
@@ -77657,14 +77299,14 @@
     1:1:int nextIndex():1088:1088 -> nextIndex
     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.Ur:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Nr:
     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.Yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.Rr:
     java.lang.Object[] value -> d
     int[] key -> c
     int size -> e
@@ -77700,7 +77342,7 @@
     4:10:java.lang.Object remove(int):309: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$EntrySet -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Qr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> b
     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>
@@ -77710,7 +77352,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Wr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Pr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -77719,10 +77361,10 @@
     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.Zr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.Sr:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.is:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.bs:
     java.lang.Object[] value -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> n
     int size -> l
@@ -77793,14 +77435,14 @@
     8:18:java.lang.Object remove(int):378:388 -> remove
     1:1:int size():727:727 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1532:1553 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.as:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Tr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1532:1532 -> <init>
     1:1:void clear():1550:1550 -> clear
     1:1:boolean contains(java.lang.Object):1545:1545 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1535:1535 -> iterator
     1:1:int size():1540:1540 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.bs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ur:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1158:1158 -> <init>
@@ -77815,7 +77457,7 @@
     1:1:void set(java.lang.Object):1155:1155 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1147:1147 -> set
     2:2:void set(java.lang.Object):1155 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.cs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Vr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1409:1410 -> <init>
     1:1:void add(java.lang.Object):1371:1371 -> add
@@ -77830,7 +77472,7 @@
     1:1:void set(java.lang.Object):1371:1371 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator.set(java.lang.Integer):1400:1400 -> set
     2:2:void set(java.lang.Object):1371 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Wr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1425:1425 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):1425:1425 -> <init>
@@ -77849,7 +77491,7 @@
     3:3:java.util.Iterator iterator():1425 -> iterator
     1:3:int lastInt():1464:1464 -> p
     1:1:int size():1436:1436 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.es:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Xr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,int):771:772 -> <init>
@@ -77861,7 +77503,7 @@
     1:1:int hashCode():817:817 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):790:791 -> setValue
     1:1:java.lang.String toString():822:822 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.fs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Yr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1205:1205 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):1205:1205 -> <init>
@@ -77883,7 +77525,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1205:1205 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1227:1227 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1205 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.gs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Zr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -77901,22 +77543,22 @@
     1:2:int previousIndex():1057:1058 -> previousIndex
     1:48:void remove():1080:1127 -> remove
     49:49:void remove():1081:1081 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.hs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.as:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1520:1521 -> <init>
     1:1:void add(java.lang.Object):1517:1517 -> add
     1:1:java.lang.Object next():1526:1526 -> next
     1:1:java.lang.Object previous():1507:1507 -> previous
     1:1:void set(java.lang.Object):1512:1512 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.ls:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.es:
     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.js:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.cs:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.ks:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.ns:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.gs:
     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.ms:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.fs:
     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
@@ -77939,7 +77581,7 @@
     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.ws:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.ps:
     java.lang.Object[] value -> d
     float f -> j
     int[] key -> c
@@ -78004,14 +77646,14 @@
     7:17:java.lang.Object remove(int):310: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.os:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.hs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     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.ps:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.is:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -78019,13 +77661,13 @@
     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.qs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.js:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     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
     1:1:int nextInt():727:727 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.rs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.ks:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     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>
@@ -78034,7 +77676,7 @@
     1:3:boolean remove(int):755:757 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.ls:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -78046,7 +77688,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ts:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ms:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     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>
@@ -78055,7 +77697,7 @@
     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.us:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.ns:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
@@ -78074,11 +77716,11 @@
     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.vs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.os:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     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.Os:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.Hs:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry[] nodePath -> l
@@ -78195,7 +77837,7 @@
     262:263:java.lang.Object remove(int):472: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$2 -> com.android.tools.r8.internal.ys:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.rs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1127:1128 -> <init>
@@ -78218,20 +77860,20 @@
     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.xs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.qs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> b
     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.zs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.ss:
     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):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.As:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.ts:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> e
     int info -> f
@@ -78252,7 +77894,7 @@
     1:1:int hashCode():919:919 -> hashCode
     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.Bs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.us:
     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
@@ -78264,7 +77906,7 @@
     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.Cs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.vs:
     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
@@ -78278,12 +77920,12 @@
     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.Ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.ws:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> c
     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.Ls:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.Es:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> j
@@ -78339,7 +77981,7 @@
     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.Es:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.xs:
     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):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -78372,19 +78014,19 @@
     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.Fs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.ys:
     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):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.Gs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.zs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> c
     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.Hs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.As:
     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
@@ -78396,7 +78038,7 @@
     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.Is:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Bs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1743 -> <init>
     1:1:void updateNext():1767:1767 -> l
@@ -78407,7 +78049,7 @@
     3:4:void updateNext():1767 -> l
     5:6:void updateNext():1767:1768 -> l
     1:2:void updatePrevious():1762:1763 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Cs:
     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
@@ -78421,14 +78063,14 @@
     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.Ks:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Ds:
     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.Ms:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Fs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> c
@@ -78451,14 +78093,14 @@
     1:1:int nextIndex():1054:1054 -> nextIndex
     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.Ns:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Gs:
     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.Qs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.Js:
     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
@@ -78468,11 +78110,11 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> c
     int lastIntKey() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Ps:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.Ss:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Is:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.Ls:
     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.Rs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.Ks:
     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
@@ -78497,7 +78139,7 @@
     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.Ws:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.Ps:
     int[] a -> b
     int size -> c
     1:2:void <init>(int[],boolean):70:71 -> <init>
@@ -78630,10 +78272,10 @@
     637:637:int set(int,int):313:313 -> c
     318:318:int set(int,int):313:313 -> c
     319:319:int set(int,int):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":638,"2":639,"3":640}}
-    638:638:int set(int,int):313:313 -> c
-    639:639:int set(int,int):313:313 -> c
-    640:640:int set(int,int):313:313 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":633,"2":634,"3":635}}
+    633:633:int set(int,int):313:313 -> c
+    634:634:int set(int,int):313:313 -> c
+    635:635:int set(int,int):313:313 -> c
     632:632:int set(int,int):313:313 -> c
     1:1:void clear():321:321 -> clear
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.clone():549:551 -> clone
@@ -78648,10 +78290,10 @@
     600:600:int removeInt(int):294:294 -> g
     300:300:int removeInt(int):294:294 -> g
     301:301:int removeInt(int):0:0 -> g
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":601,"2":602,"3":603}}
-    601:601:int removeInt(int):294:294 -> g
-    602:602:int removeInt(int):294:294 -> g
-    603:603:int removeInt(int):294:294 -> g
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":596,"2":597,"3":598}}
+    596:596:int removeInt(int):294:294 -> g
+    597:597:int removeInt(int):294:294 -> g
+    598:598:int removeInt(int):294:294 -> g
     595:595:int removeInt(int):294:294 -> g
     1:3:boolean rem(int):304:306 -> h
     1:1:boolean isEmpty():339:339 -> isEmpty
@@ -78664,7 +78306,7 @@
     6:6:void grow(int):250:250 -> n
     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.Vs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.Os:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -78678,7 +78320,7 @@
     1:3:int nextInt():506:506 -> nextInt
     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.Ys:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.Rs:
     int[] a -> b
     int size -> c
     1:2:void <init>():55:56 -> <init>
@@ -78721,23 +78363,23 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.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.ints.IntArraySet$1 -> com.android.tools.r8.internal.Xs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.Qs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> c
     int next -> b
     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 -> nextInt
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.Zs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.Ss:
     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.at:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.Ts:
     int previousInt() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.ct:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.Vs:
     boolean contains(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.ft:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.Ys:
     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.dt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.Ws:
     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
@@ -78748,7 +78390,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.et:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Xs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> b
     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
@@ -78773,54 +78415,33 @@
     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.gt:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.it:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.lt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.Zs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.bt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.et:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-    1:1:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
-    2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):289:289 -> a
-    2:6:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    7:7:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    7:7:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    8:8:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12,"4":13,"5":14,"6":15}}
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    10:10:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    11:11:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    11:11:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    12:12:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    12:12:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    13:13:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    14:14:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    14:14:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    15:15:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    15:15:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-    9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
-    9:9:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.jt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.ct:
     1:1:void <init>():42:42 -> <init>
     1:1:int previousInt():62:62 -> c
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int nextInt():57:57 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.kt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.dt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> b
     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 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.mt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.ft:
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
     void add(int,int) -> b
     int getInt(int) -> b
     int set(int,int) -> c
     int removeInt(int) -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.nt:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.pt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.gt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.it:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
     1:1:void <clinit>():323:323 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.ot:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.ht:
     1:1:void <init>():65:65 -> <init>
     1:1:boolean add(java.lang.Integer):156:156 -> a
     2:3:void getElements(int,int[],int,int):263:264 -> a
@@ -78864,7 +78485,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList.subList(int,int):246:246 -> subList
     1:1:java.util.List subList(int,int):62 -> subList
     1:1:java.lang.String toString():311:311 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.wt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.pt:
     int[] key -> b
     float f -> h
     int maxFill -> f
@@ -78921,7 +78542,7 @@
     9:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.shiftKeys(int):339:343 -> k
     9:13:boolean removeEntry(int):349 -> k
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.vt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.ot:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNull -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> g
@@ -78940,25 +78561,25 @@
     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.xt:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.zt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.qt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.st:
     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.yt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.rt:
     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 -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.At:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.tt:
     int firstInt() -> L
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int) -> d
     int lastInt() -> p
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.Ct:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.vt:
     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.Bt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.ut:
     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
@@ -79132,13 +78753,13 @@
     49:49:void ensureIndex(int):47:47 -> h
     50:50:void ensureIndex(int):46:46 -> h
     51:51:void ensureIndex(int):0:0 -> h
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":103,"2":104,"3":105,"4":106,"5":107,"6":108}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100,"4":101,"5":102,"6":103}}
+    98:98:void ensureIndex(int):46:46 -> h
+    99:99:void ensureIndex(int):46:46 -> h
+    100:100:void ensureIndex(int):46:46 -> h
+    101:101:void ensureIndex(int):46:46 -> h
+    102:102:void ensureIndex(int):46:46 -> h
     103:103:void ensureIndex(int):46:46 -> h
-    104:104:void ensureIndex(int):46:46 -> h
-    105:105:void ensureIndex(int):46:46 -> h
-    106:106:void ensureIndex(int):46:46 -> h
-    107:107:void ensureIndex(int):46:46 -> h
-    108:108:void ensureIndex(int):46:46 -> h
     97:97:void ensureIndex(int):46:46 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.listIterator():192:192 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.iterator():180 -> hashCode
@@ -79155,13 +78776,13 @@
     64:64:void ensureRestrictedIndex(int):62:62 -> i
     65:65:void ensureRestrictedIndex(int):61:61 -> i
     66:66:void ensureRestrictedIndex(int):0:0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":133,"2":134,"3":135,"4":136,"5":137,"6":138}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":128,"2":129,"3":130,"4":131,"5":132,"6":133}}
+    128:128:void ensureRestrictedIndex(int):61:61 -> i
+    129:129:void ensureRestrictedIndex(int):61:61 -> i
+    130:130:void ensureRestrictedIndex(int):61:61 -> i
+    131:131:void ensureRestrictedIndex(int):61:61 -> i
+    132:132:void ensureRestrictedIndex(int):61:61 -> i
     133:133:void ensureRestrictedIndex(int):61:61 -> i
-    134:134:void ensureRestrictedIndex(int):61:61 -> i
-    135:135:void ensureRestrictedIndex(int):61:61 -> i
-    136:136:void ensureRestrictedIndex(int):61:61 -> i
-    137:137:void ensureRestrictedIndex(int):61:61 -> i
-    138:138:void ensureRestrictedIndex(int):61:61 -> i
     127:127:void ensureRestrictedIndex(int):61:61 -> i
     1:1:int indexOf(java.lang.Object):619:619 -> indexOf
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLongList.listIterator():192:192 -> iterator
@@ -79263,9 +78884,9 @@
     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.BC:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.CC:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.LC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.vC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.EC:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> c
     int size -> h
@@ -79326,14 +78947,14 @@
     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.DC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.wC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     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.EC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.xC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> i
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):600:600 -> <init>
@@ -79341,13 +78962,13 @@
     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.FC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.yC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     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
     1:1:long nextLong():727:727 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.GC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.zC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     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>
@@ -79355,7 +78976,7 @@
     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.HC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.AC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -79366,7 +78987,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.BC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     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>
@@ -79375,7 +78996,7 @@
     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.JC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.CC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> f
@@ -79394,11 +79015,11 @@
     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.KC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.DC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     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.NC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.GC:
     long[] a -> b
     int size -> c
     1:3:void <init>(int):81:83 -> <init>
@@ -79441,10 +79062,10 @@
     637:637:long set(int,long):313:313 -> b
     318:318:long set(int,long):313:313 -> b
     319:319:long set(int,long):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":638,"2":639,"3":640}}
-    638:638:long set(int,long):313:313 -> b
-    639:639:long set(int,long):313:313 -> b
-    640:640:long set(int,long):313:313 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":633,"2":634,"3":635}}
+    633:633:long set(int,long):313:313 -> b
+    634:634:long set(int,long):313:313 -> b
+    635:635:long set(int,long):313:313 -> b
     632:632:long set(int,long):313:313 -> b
     1:3:long getLong(int):274:274 -> c
     4:4:long getLong(int):0:0 -> c
@@ -79486,7 +79107,7 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator listIterator(int):493:494 -> j
     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.MC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.FC:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -79500,17 +79121,17 @@
     1:3:long nextLong():506:506 -> nextLong
     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.OC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.HC:
     long previousLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.PC:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.RC:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.SC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.KC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.LC:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long getLong(int) -> c
     long removeLong(int) -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.YC:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.RC:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.internal.J0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -79595,7 +79216,7 @@
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.defRetValue -> b
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
-    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,int) -> b
+    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,int) -> a
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.removeInt(java.lang.Object) -> c
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
     boolean containsValue(int) -> d
@@ -79849,13 +79470,13 @@
     50:50:void ensureIndex(int):48:48 -> h
     51:51:void ensureIndex(int):47:47 -> h
     52:52:void ensureIndex(int):0:0 -> h
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":105,"2":106,"3":107,"4":108,"5":109,"6":110}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":100,"2":101,"3":102,"4":103,"5":104,"6":105}}
+    100:100:void ensureIndex(int):47:47 -> h
+    101:101:void ensureIndex(int):47:47 -> h
+    102:102:void ensureIndex(int):47:47 -> h
+    103:103:void ensureIndex(int):47:47 -> h
+    104:104:void ensureIndex(int):47:47 -> h
     105:105:void ensureIndex(int):47:47 -> h
-    106:106:void ensureIndex(int):47:47 -> h
-    107:107:void ensureIndex(int):47:47 -> h
-    108:108:void ensureIndex(int):47:47 -> h
-    109:109:void ensureIndex(int):47:47 -> h
-    110:110:void ensureIndex(int):47:47 -> h
     99:99:void ensureIndex(int):47:47 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.listIterator():193:193 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.iterator():181 -> hashCode
@@ -79872,13 +79493,13 @@
     65:65:void ensureRestrictedIndex(int):63:63 -> i
     66:66:void ensureRestrictedIndex(int):62:62 -> i
     67:67:void ensureRestrictedIndex(int):0:0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":135,"2":136,"3":137,"4":138,"5":139,"6":140}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":130,"2":131,"3":132,"4":133,"5":134,"6":135}}
+    130:130:void ensureRestrictedIndex(int):62:62 -> i
+    131:131:void ensureRestrictedIndex(int):62:62 -> i
+    132:132:void ensureRestrictedIndex(int):62:62 -> i
+    133:133:void ensureRestrictedIndex(int):62:62 -> i
+    134:134:void ensureRestrictedIndex(int):62:62 -> i
     135:135:void ensureRestrictedIndex(int):62:62 -> i
-    136:136:void ensureRestrictedIndex(int):62:62 -> i
-    137:137:void ensureRestrictedIndex(int):62:62 -> i
-    138:138:void ensureRestrictedIndex(int):62:62 -> i
-    139:139:void ensureRestrictedIndex(int):62:62 -> i
-    140:140:void ensureRestrictedIndex(int):62:62 -> i
     129:129:void ensureRestrictedIndex(int):62:62 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectList.listIterator():193:193 -> indexOf
     1:1:int indexOf(java.lang.Object):280 -> indexOf
@@ -79992,7 +79613,7 @@
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.defRetValue -> b
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
-    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,int) -> b
+    int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,int) -> a
     int com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.removeInt(java.lang.Object) -> c
     1:1:boolean containsValue(java.lang.Object):62:62 -> containsValue
     boolean containsValue(int) -> d
@@ -80136,13 +79757,13 @@
     50:50:void ensureIndex(int):48:48 -> h
     51:51:void ensureIndex(int):47:47 -> h
     52:52:void ensureIndex(int):0:0 -> h
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":105,"2":106,"3":107,"4":108,"5":109,"6":110}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":100,"2":101,"3":102,"4":103,"5":104,"6":105}}
+    100:100:void ensureIndex(int):47:47 -> h
+    101:101:void ensureIndex(int):47:47 -> h
+    102:102:void ensureIndex(int):47:47 -> h
+    103:103:void ensureIndex(int):47:47 -> h
+    104:104:void ensureIndex(int):47:47 -> h
     105:105:void ensureIndex(int):47:47 -> h
-    106:106:void ensureIndex(int):47:47 -> h
-    107:107:void ensureIndex(int):47:47 -> h
-    108:108:void ensureIndex(int):47:47 -> h
-    109:109:void ensureIndex(int):47:47 -> h
-    110:110:void ensureIndex(int):47:47 -> h
     99:99:void ensureIndex(int):47:47 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.listIterator():193:193 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.iterator():181 -> hashCode
@@ -80159,13 +79780,13 @@
     65:65:void ensureRestrictedIndex(int):63:63 -> i
     66:66:void ensureRestrictedIndex(int):62:62 -> i
     67:67:void ensureRestrictedIndex(int):0:0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":135,"2":136,"3":137,"4":138,"5":139,"6":140}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":130,"2":131,"3":132,"4":133,"5":134,"6":135}}
+    130:130:void ensureRestrictedIndex(int):62:62 -> i
+    131:131:void ensureRestrictedIndex(int):62:62 -> i
+    132:132:void ensureRestrictedIndex(int):62:62 -> i
+    133:133:void ensureRestrictedIndex(int):62:62 -> i
+    134:134:void ensureRestrictedIndex(int):62:62 -> i
     135:135:void ensureRestrictedIndex(int):62:62 -> i
-    136:136:void ensureRestrictedIndex(int):62:62 -> i
-    137:137:void ensureRestrictedIndex(int):62:62 -> i
-    138:138:void ensureRestrictedIndex(int):62:62 -> i
-    139:139:void ensureRestrictedIndex(int):62:62 -> i
-    140:140:void ensureRestrictedIndex(int):62:62 -> i
     129:129:void ensureRestrictedIndex(int):62:62 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceList.listIterator():193:193 -> indexOf
     1:1:int indexOf(java.lang.Object):280 -> indexOf
@@ -80238,7 +79859,7 @@
     1:7:int hashCode():57:63 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.o1:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.cI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.SH:
     java.lang.Object[] key -> b
     boolean[] value -> c
     int size -> d
@@ -80266,7 +79887,7 @@
     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$EntrySet -> com.android.tools.r8.internal.bI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.RH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> b
     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>
@@ -80276,7 +79897,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.aI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.QH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -80285,7 +79906,7 @@
     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.fI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.VH:
     java.lang.Object[] key -> c
     int[] value -> d
     int size -> e
@@ -80295,8 +79916,8 @@
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):37:37 -> a
     2:2:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap,java.lang.Object):37:37 -> a
     3:6:int getInt(java.lang.Object):244:247 -> a
+    7:26:int put(java.lang.Object,int):283:302 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):37:37 -> b
-    2:21:int put(java.lang.Object,int):283:302 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):37:37 -> c
     2:9:int removeInt(java.lang.Object):308:315 -> c
     1:4:void clear():257:260 -> clear
@@ -80316,7 +79937,7 @@
     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$EntrySet -> com.android.tools.r8.internal.eI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.UH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> b
     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>
@@ -80326,7 +79947,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.dI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.TH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -80335,9 +79956,9 @@
     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.gI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.WH:
     int getInt(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.pI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.fI:
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
     java.lang.Object[] key -> c
@@ -80360,10 +79981,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.removeNullEntry():286:290 -> a
     3:7:int access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):87 -> a
-    8:18:int getInt(java.lang.Object):721:731 -> a
-    1:25:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.insert(java.lang.Object,int):307:331 -> b
-    1:25:int put(java.lang.Object,int):338 -> b
-    26:28:int put(java.lang.Object,int):339:341 -> b
+    8:32:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.insert(java.lang.Object,int):307:331 -> a
+    8:32:int put(java.lang.Object,int):338 -> a
+    33:35:int put(java.lang.Object,int):339:341 -> a
+    36:46:int getInt(java.lang.Object):721:731 -> a
     1:1:int removeInt(java.lang.Object):431:431 -> c
     2:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.removeNullEntry():285:290 -> c
     2:7:int removeInt(java.lang.Object):431 -> c
@@ -80412,14 +80033,14 @@
     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.hI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.XH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     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 -> f
     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.iI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.YH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -80434,14 +80055,14 @@
     1:1:void set(java.lang.Object):1219:1219 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.jI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.ZH:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     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.kI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.aI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     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>
@@ -80463,7 +80084,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.lI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.bI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -80482,7 +80103,7 @@
     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.mI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.cI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     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>
@@ -80504,7 +80125,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.nI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.dI:
     int curr -> d
     int index -> e
     int prev -> b
@@ -80522,7 +80143,7 @@
     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.oI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.eI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     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
@@ -80537,11 +80158,11 @@
     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.sI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.iI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.qI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.rI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.BI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.gI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.hI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.rI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> c
@@ -80559,10 +80180,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.removeNullEntry():228:231 -> a
     3:6:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):49 -> a
-    7:17:int getInt(java.lang.Object):371:381 -> a
-    1:16:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> b
-    1:16:int put(java.lang.Object,int):270 -> b
-    17:19:int put(java.lang.Object,int):271:273 -> b
+    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> a
+    7:22:int put(java.lang.Object,int):270 -> a
+    23:25:int put(java.lang.Object,int):271:273 -> a
+    26:36:int getInt(java.lang.Object):371:381 -> a
     1:1:int removeInt(java.lang.Object):353:353 -> c
     2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.removeNullEntry():227:231 -> c
     2:6:int removeInt(java.lang.Object):353 -> c
@@ -80604,14 +80225,14 @@
     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.tI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.jI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     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 -> f
     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.uI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.kI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> i
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):654:654 -> <init>
@@ -80619,11 +80240,11 @@
     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.vI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.lI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     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.wI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.mI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     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>
@@ -80632,7 +80253,7 @@
     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.xI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.nI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):473:474 -> <init>
@@ -80651,7 +80272,7 @@
     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.yI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.oI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     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>
@@ -80660,7 +80281,7 @@
     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.zI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.pI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -80679,16 +80300,16 @@
     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.AI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.qI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     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
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.CI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.DI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.EI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.NI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.sI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.tI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.uI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.DI:
     long[] value -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
@@ -80750,7 +80371,7 @@
     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.FI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.vI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     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
@@ -80762,7 +80383,7 @@
     3:6:boolean contains(long):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.GI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.wI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):654:654 -> <init>
@@ -80770,11 +80391,11 @@
     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.HI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.xI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     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.II:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.yI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     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>
@@ -80783,7 +80404,7 @@
     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.JI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.zI:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):473:474 -> <init>
@@ -80802,7 +80423,7 @@
     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.KI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.AI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     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>
@@ -80811,7 +80432,7 @@
     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.LI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.BI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -80830,13 +80451,13 @@
     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.MI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.CI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     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
     1:1:long nextLong():836:836 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.WI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.MI:
     java.lang.Object[] key -> b
     int size -> l
     java.lang.Object[] value -> c
@@ -80910,14 +80531,14 @@
     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.OI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.EI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     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.PI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.FI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1181:1181 -> <init>
@@ -80932,14 +80553,14 @@
     1:1:void set(java.lang.Object):1178:1178 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1170:1170 -> set
     2:2:void set(java.lang.Object):1178 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.QI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.GI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     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.RI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.HI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     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>
@@ -80961,7 +80582,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1422 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.SI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.II:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):805:806 -> <init>
@@ -80971,7 +80592,7 @@
     1:1:int hashCode():839:839 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):824:825 -> setValue
     1:1:java.lang.String toString():844:844 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.TI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.JI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     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>
@@ -80993,7 +80614,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1228:1228 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.UI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.KI:
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
@@ -81011,17 +80632,17 @@
     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.VI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.LI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     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.YI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.XI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.ZI:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.iJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.OI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.NI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.PI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.YI:
     java.lang.Object[] value -> d
     int size -> l
     java.lang.Object[] key -> c
@@ -81098,14 +80719,14 @@
     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.aJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.QI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     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.bJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.RI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1150:1150 -> <init>
@@ -81120,14 +80741,14 @@
     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.cJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.SI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     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.dJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.TI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     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>
@@ -81149,7 +80770,7 @@
     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.eJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.UI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):774:775 -> <init>
@@ -81159,7 +80780,7 @@
     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.fJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.VI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     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>
@@ -81181,7 +80802,7 @@
     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.gJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.WI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -81199,16 +80820,16 @@
     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.hJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.XI:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     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.kJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.jJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.CJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.aJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.ZI:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.sJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry[] nodePath -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
@@ -81319,7 +80940,7 @@
     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.mJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.cJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1116:1117 -> <init>
@@ -81342,20 +80963,20 @@
     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.lJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.bJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 this$1 -> b
     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.nJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.dJ:
     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):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.oJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.eJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry left -> d
     int info -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry right -> e
@@ -81376,7 +80997,7 @@
     1:1:int hashCode():906:906 -> hashCode
     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.pJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.fJ:
     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
@@ -81388,18 +81009,18 @@
     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.qJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.gJ:
     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.rJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.hJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> c
     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.zJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.pJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
@@ -81497,7 +81118,7 @@
     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.sJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.iJ:
     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):1428:1428 -> <init>
     1:1:void clear():1478:1478 -> clear
@@ -81530,19 +81151,19 @@
     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.tJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.jJ:
     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):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.uJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.kJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> c
     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.vJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.lJ:
     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
@@ -81554,7 +81175,7 @@
     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.wJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.mJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703:1704 -> <init>
     1:1:void updateNext():1728:1728 -> l
@@ -81571,20 +81192,20 @@
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> m
     3:3:void updatePrevious():1724 -> m
     4:4:void updatePrevious():1724:1724 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.xJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.nJ:
     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.yJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.oJ:
     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.AJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.qJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry prev -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry curr -> d
@@ -81607,15 +81228,15 @@
     1:1:int nextIndex():1043:1043 -> nextIndex
     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.BJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.rJ:
     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.DJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.FJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.tJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.vJ:
     java.lang.Object[] a -> b
     int size -> c
     1:3:void <init>(int):96:98 -> <init>
@@ -81651,10 +81272,10 @@
     644:644:java.lang.Object get(int):317:317 -> get
     321:321:java.lang.Object get(int):317:317 -> get
     322:322:java.lang.Object get(int):0:0 -> get
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":645,"2":646,"3":647}}
-    645:645:java.lang.Object get(int):317:317 -> get
-    646:646:java.lang.Object get(int):317:317 -> get
-    647:647:java.lang.Object get(int):317:317 -> get
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":640,"2":641,"3":642}}
+    640:640:java.lang.Object get(int):317:317 -> get
+    641:641:java.lang.Object get(int):317:317 -> get
+    642:642:java.lang.Object get(int):317:317 -> get
     639:639:java.lang.Object get(int):317:317 -> get
     1:2:int indexOf(java.lang.Object):323:324 -> indexOf
     1:1:boolean isEmpty():385:385 -> isEmpty
@@ -81687,13 +81308,13 @@
     725:725:java.lang.Object set(int,java.lang.Object):357:357 -> set
     362:362:java.lang.Object set(int,java.lang.Object):357:357 -> set
     363:363:java.lang.Object set(int,java.lang.Object):0:0 -> set
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":726,"2":727,"3":728}}
-    726:726:java.lang.Object set(int,java.lang.Object):357:357 -> set
-    727:727:java.lang.Object set(int,java.lang.Object):357:357 -> set
-    728:728:java.lang.Object set(int,java.lang.Object):357:357 -> set
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":721,"2":722,"3":723}}
+    721:721:java.lang.Object set(int,java.lang.Object):357:357 -> set
+    722:722:java.lang.Object set(int,java.lang.Object):357:357 -> set
+    723:723:java.lang.Object set(int,java.lang.Object):357:357 -> set
     720:720: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.EJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.uJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -81707,7 +81328,7 @@
     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.HJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.xJ:
     java.lang.Object[] a -> b
     int size -> c
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -81720,10 +81341,10 @@
     225:225:void <init>(java.lang.Object[],int):107:107 -> <init>
     112:112:void <init>(java.lang.Object[],int):107:107 -> <init>
     113:113:void <init>(java.lang.Object[],int):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226,"2":227,"3":228}}
-    226:226:void <init>(java.lang.Object[],int):107:107 -> <init>
-    227:227:void <init>(java.lang.Object[],int):107:107 -> <init>
-    228:228:void <init>(java.lang.Object[],int):107:107 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":221,"2":222,"3":223}}
+    221:221:void <init>(java.lang.Object[],int):107:107 -> <init>
+    222:222:void <init>(java.lang.Object[],int):107:107 -> <init>
+    223:223:void <init>(java.lang.Object[],int):107:107 -> <init>
     220:220:void <init>(java.lang.Object[],int):107:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):29:29 -> a
     1:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet.findKey(java.lang.Object):111:112 -> add
@@ -81746,23 +81367,23 @@
     1:2:boolean remove(java.lang.Object):154 -> remove
     3:7:boolean remove(java.lang.Object):156: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.GJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.wJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> c
     int next -> 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.IJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.yJ:
 # {"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.KJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.AJ:
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.BidirectionalIterator.previous() -> previous
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.LJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.internal.OJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.BJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.internal.EJ:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.MJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.CJ:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -81773,7 +81394,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.internal.NJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.internal.DJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection collection -> b
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -81795,16 +81416,16 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.QJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.UJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.GJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.KJ:
     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.RJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.HJ:
     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.SJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.IJ:
     java.lang.Object element -> b
     int curr -> c
     1:2:void <init>(java.lang.Object):127:128 -> <init>
@@ -81814,24 +81435,24 @@
     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.TJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.JJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> b
     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.VJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.LJ:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.WJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.YJ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.bK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.MJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.OJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.RJ:
     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.ZJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.PJ:
     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.aK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.QJ:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -81849,11 +81470,11 @@
     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.cK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.eK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.SJ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.UJ:
     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.dK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.TJ:
     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
@@ -81864,17 +81485,17 @@
     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.tQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.jQ:
     boolean getBoolean(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.wQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.mQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.uQ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.vQ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.zQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.kQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.lQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.pQ:
     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.xQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.nQ:
     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
@@ -81898,7 +81519,7 @@
     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.yQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.oQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> f
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.key -> b
@@ -81942,7 +81563,7 @@
     241:241: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.IQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.yQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     java.lang.Object[] key -> b
     boolean[] value -> c
@@ -82047,7 +81668,7 @@
       # {"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.AQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.qQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     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
@@ -82059,7 +81680,7 @@
     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.BQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.rQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):609:609 -> <init>
@@ -82067,11 +81688,11 @@
     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.CQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.sQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     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.DQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.tQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     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>
@@ -82080,7 +81701,7 @@
     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.EQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.uQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):428:429 -> <init>
@@ -82099,7 +81720,7 @@
     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.FQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.vQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     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>
@@ -82108,7 +81729,7 @@
     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.GQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.wQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
@@ -82127,13 +81748,13 @@
     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.HQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.xQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     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.LQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.BQ:
     java.lang.Object[] key -> c
     int[] value -> d
     int size -> e
@@ -82144,11 +81765,11 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.findKey(java.lang.Object):236:237 -> a
     3:4:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,java.lang.Object):37 -> a
-    5:8:int getInt(java.lang.Object):244:247 -> a
+    5:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.findKey(java.lang.Object):235:237 -> a
+    5:7:int put(java.lang.Object,int):283 -> a
+    8:25:int put(java.lang.Object,int):285:302 -> a
+    26:29:int getInt(java.lang.Object):244:247 -> a
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> b
-    2:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.findKey(java.lang.Object):235:237 -> b
-    2:4:int put(java.lang.Object,int):283 -> b
-    5:22:int put(java.lang.Object,int):285:302 -> b
     1:1:java.lang.Object[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.reference2IntEntrySet():231:231 -> c
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> c
@@ -82170,7 +81791,7 @@
     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$EntrySet -> com.android.tools.r8.internal.KQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.AQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> b
     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>
@@ -82180,7 +81801,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.JQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.zQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -82189,9 +81810,9 @@
     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.MQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.CQ:
     int getInt(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.VQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.LQ:
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
     java.lang.Object[] key -> c
@@ -82215,10 +81836,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:7:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.removeNullEntry():286:290 -> a
     3:7:int access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):87 -> a
-    8:18:int getInt(java.lang.Object):721:731 -> a
-    1:25:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.insert(java.lang.Object,int):307:331 -> b
-    1:25:int put(java.lang.Object,int):338 -> b
-    26:28:int put(java.lang.Object,int):339:341 -> b
+    8:32:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.insert(java.lang.Object,int):307:331 -> a
+    8:32:int put(java.lang.Object,int):338 -> a
+    33:35:int put(java.lang.Object,int):339:341 -> a
+    36:46:int getInt(java.lang.Object):721:731 -> a
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87:87 -> c
     2:2:int removeInt(java.lang.Object):431:431 -> c
     3:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.removeNullEntry():285:290 -> c
@@ -82267,14 +81888,14 @@
     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.NQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.DQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     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 -> f
     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.OQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.EQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -82289,14 +81910,14 @@
     1:1:void set(java.lang.Object):1219:1219 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.PQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.FQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     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.QQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.GQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     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>
@@ -82316,7 +81937,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet 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.RQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.HQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -82335,7 +81956,7 @@
     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.SQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.IQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     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>
@@ -82357,7 +81978,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet 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.TQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.JQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -82375,7 +81996,7 @@
     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.UQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.KQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     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
@@ -82390,11 +82011,11 @@
     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.YQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.OQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.WQ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.XQ:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.hR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.MQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.NQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.XQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> c
@@ -82415,10 +82036,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.removeNullEntry():228:231 -> a
     3:6:int access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):49 -> a
-    7:17:int getInt(java.lang.Object):371:381 -> a
-    1:16:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> b
-    1:16:int put(java.lang.Object,int):270 -> b
-    17:19:int put(java.lang.Object,int):271:273 -> b
+    7:22:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.insert(java.lang.Object,int):248:263 -> a
+    7:22:int put(java.lang.Object,int):270 -> a
+    23:25:int put(java.lang.Object,int):271:273 -> a
+    26:36:int getInt(java.lang.Object):371:381 -> a
     1:1:int removeInt(java.lang.Object):353:353 -> c
     2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.removeNullEntry():227:231 -> c
     2:6:int removeInt(java.lang.Object):353 -> c
@@ -82460,14 +82081,14 @@
     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.ZQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.PQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     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 -> f
     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.aR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.QQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -82475,11 +82096,11 @@
     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.bR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.RQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     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.cR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.SQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     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>
@@ -82488,7 +82109,7 @@
     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.dR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.TQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -82507,7 +82128,7 @@
     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.eR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.UQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     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>
@@ -82516,7 +82137,7 @@
     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.fR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.VQ:
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
     int c -> d
@@ -82535,16 +82156,16 @@
     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.gR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.WQ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     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
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.iR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.jR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.kR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.tR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.YQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.ZQ:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.aR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.jR:
     long[] value -> c
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> i
@@ -82605,7 +82226,7 @@
     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.lR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.bR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     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
@@ -82617,7 +82238,7 @@
     3:6:boolean contains(long):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.mR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.cR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
@@ -82625,11 +82246,11 @@
     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.nR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.dR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     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.oR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.eR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     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>
@@ -82638,7 +82259,7 @@
     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.pR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.fR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
@@ -82656,7 +82277,7 @@
     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.qR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.gR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     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>
@@ -82665,7 +82286,7 @@
     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.rR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.hR:
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
     int c -> d
@@ -82684,13 +82305,13 @@
     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.sR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.iR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
     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
     1:1:long nextLong():836:836 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.vR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.lR:
     java.lang.Object[] a -> b
     int size -> c
     1:3:void <init>(int):96:98 -> <init>
@@ -82726,10 +82347,10 @@
     644:644:java.lang.Object get(int):317:317 -> get
     321:321:java.lang.Object get(int):317:317 -> get
     322:322:java.lang.Object get(int):0:0 -> get
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":645,"2":646,"3":647}}
-    645:645:java.lang.Object get(int):317:317 -> get
-    646:646:java.lang.Object get(int):317:317 -> get
-    647:647:java.lang.Object get(int):317:317 -> get
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":640,"2":641,"3":642}}
+    640:640:java.lang.Object get(int):317:317 -> get
+    641:641:java.lang.Object get(int):317:317 -> get
+    642:642:java.lang.Object get(int):317:317 -> get
     639:639:java.lang.Object get(int):317:317 -> get
     1:2:int indexOf(java.lang.Object):323:324 -> indexOf
     1:1:boolean isEmpty():385:385 -> isEmpty
@@ -82762,13 +82383,13 @@
     725:725:java.lang.Object set(int,java.lang.Object):357:357 -> set
     362:362:java.lang.Object set(int,java.lang.Object):357:357 -> set
     363:363:java.lang.Object set(int,java.lang.Object):0:0 -> set
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":726,"2":727,"3":728}}
-    726:726:java.lang.Object set(int,java.lang.Object):357:357 -> set
-    727:727:java.lang.Object set(int,java.lang.Object):357:357 -> set
-    728:728:java.lang.Object set(int,java.lang.Object):357:357 -> set
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":721,"2":722,"3":723}}
+    721:721:java.lang.Object set(int,java.lang.Object):357:357 -> set
+    722:722:java.lang.Object set(int,java.lang.Object):357:357 -> set
+    723:723:java.lang.Object set(int,java.lang.Object):357:357 -> set
     720:720: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.uR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.kR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -82782,7 +82403,7 @@
     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.xR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.nR:
     java.lang.Object[] a -> b
     int size -> c
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -82795,10 +82416,10 @@
     225:225:void <init>(java.lang.Object[],int):107:107 -> <init>
     112:112:void <init>(java.lang.Object[],int):107:107 -> <init>
     113:113:void <init>(java.lang.Object[],int):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":226,"2":227,"3":228}}
-    226:226:void <init>(java.lang.Object[],int):107:107 -> <init>
-    227:227:void <init>(java.lang.Object[],int):107:107 -> <init>
-    228:228:void <init>(java.lang.Object[],int):107:107 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":221,"2":222,"3":223}}
+    221:221:void <init>(java.lang.Object[],int):107:107 -> <init>
+    222:222:void <init>(java.lang.Object[],int):107:107 -> <init>
+    223:223:void <init>(java.lang.Object[],int):107:107 -> <init>
     220:220:void <init>(java.lang.Object[],int):107:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):29:29 -> a
     1:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet.findKey(java.lang.Object):111:112 -> add
@@ -82821,17 +82442,17 @@
     1:2:boolean remove(java.lang.Object):154 -> remove
     3:7:boolean remove(java.lang.Object):156: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.wR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.mR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> c
     int next -> b
     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.yR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.BR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.oR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.rR:
     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.zR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.pR:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection.iterator():55:55 -> iterator
@@ -82841,7 +82462,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.AR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.qR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> b
     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
@@ -82863,9 +82484,9 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.CR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.sR:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.ER:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.uR:
     java.lang.Object[] key -> b
     float f -> h
     int maxFill -> f
@@ -82910,7 +82531,7 @@
     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$SetIterator -> com.android.tools.r8.internal.DR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.tR:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> g
     boolean mustReturnNull -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
@@ -82929,16 +82550,16 @@
     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.FR:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.IR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.vR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.yR:
     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.GR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.wR:
     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.HR:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.xR:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -82956,8 +82577,8 @@
     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.JR:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.B6:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.zR:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.A6:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> i
@@ -82967,162 +82588,162 @@
     com.android.tools.r8.cf.CfVersion MIN_VERSION_FOR_COMPILER_GENERATED_CODE -> h
     com.android.tools.r8.graph.GraphLens graphLens -> c
     com.android.tools.r8.dex.Marker marker -> f
-    1:18:void <clinit>():79:96 -> <clinit>
-    1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):99:108 -> <init>
+    1:18:void <clinit>():78:95 -> <clinit>
+    1:10:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):98:107 -> <init>
     1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
-    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):489 -> a
+    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):483 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):488:488 -> a
+    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):482:482 -> a
     3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
-    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):491 -> a
-    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):490:497 -> a
-    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):495:495 -> a
-    13:14:void write(com.android.tools.r8.ClassFileConsumer):112:113 -> a
-    15:19:void write(com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.utils.AndroidApp):117:121 -> a
-    20:20:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):193:193 -> a
-    21:21:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):229:229 -> a
-    21:21:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):193 -> a
-    22:32:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):194:204 -> a
-    33:39:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):365:371 -> a
-    33:39:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):204 -> a
-    40:40:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):205:205 -> a
-    41:48:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):341:348 -> a
-    41:48:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):206 -> a
-    49:67:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):207:225 -> a
-    68:68:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:276 -> a
-    68:68:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):225 -> a
+    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):485 -> a
+    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):484:491 -> a
+    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):489:489 -> a
+    13:14:void write(com.android.tools.r8.ClassFileConsumer):111:112 -> a
+    15:19:void write(com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.utils.AndroidApp):116:120 -> a
+    20:23:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):137:140 -> a
+    24:29:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):139:144 -> a
+    30:33:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):125:128 -> a
+    30:33:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    34:34:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> a
+    34:34:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128 -> a
+    34:34:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    35:35:boolean com.android.tools.r8.dex.Marker.isDexBackend():232:232 -> a
+    35:35:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128 -> a
+    35:35:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    36:37:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):128:129 -> a
+    36:37:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    38:38:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> a
+    38:38:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130 -> a
+    38:38:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    39:39:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130:130 -> a
+    39:39:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144 -> a
+    40:47:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):144:151 -> a
+    48:48:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):223:223 -> a
+    48:48:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):151 -> a
+    49:61:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):153:165 -> a
+    62:62:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> a
+    62:62:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):169 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    71:74:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):279:282 -> a
-    71:74:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):225 -> a
-    75:86:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):227:238 -> a
-    87:97:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):375:385 -> a
-    87:97:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):238 -> a
-    98:119:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):240:261 -> a
-    120:120:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
-    120:120:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):261 -> a
+    63:65:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):171:173 -> a
+    66:70:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):170:174 -> a
+    71:71:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):167:167 -> a
+    72:73:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):155:156 -> a
+    74:74:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> a
+    74:74:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):160 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    123:126:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
-    123:126:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):261 -> a
-    127:163:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):262:298 -> a
-    164:168:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
-    164:168:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):298 -> a
-    169:169:void lambda$writeClass$0(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):281:281 -> a
-    170:170:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):299:299 -> a
-    171:171:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):303:303 -> a
-    172:178:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):312:318 -> a
-    179:182:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):316:319 -> a
-    183:183:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    184:187:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323:326 -> a
-    188:188:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
-    188:188:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):326 -> a
+    75:76:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):161:162 -> a
+    77:96:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):158:177 -> a
+    97:97:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187:187 -> a
+    98:98:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):229:229 -> a
+    98:98:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):187 -> a
+    99:109:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):188:198 -> a
+    110:116:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):359:365 -> a
+    110:116:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):198 -> a
+    117:117:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):199:199 -> a
+    118:125:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):335:342 -> a
+    118:125:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):200 -> a
+    126:144:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):201:219 -> a
+    145:145:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:276 -> a
+    145:145:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    189:189:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
-    189:189:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):326 -> a
-    190:190:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):326:326 -> a
-    191:191:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":541,"2":542,"3":543}}
-    541:541:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):326:326 -> a
-    542:542:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):326:326 -> a
-    543:543:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):326:326 -> a
-    518:519:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327:328 -> a
-    520:520:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1949:1949 -> a
-    520:520:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):329 -> a
+    148:151:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):279:282 -> a
+    148:151:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):219 -> a
+    152:163:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):221:232 -> a
+    164:174:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):369:379 -> a
+    164:174:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):232 -> a
+    175:196:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):234:255 -> a
+    197:197:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
+    197:197:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):255 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    524:524:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1953:1953 -> a
-    524:524:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):329 -> a
-    525:525: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
-    525:525:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1954 -> a
-    525:525:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):329 -> a
-    526:531:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):328:333 -> a
-    532:536:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1949:1953 -> a
-    532:536:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):333 -> a
-    537:537: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
-    537:537:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1954 -> a
-    537:537:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):333 -> a
-    538:540:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):334:336 -> a
-    544:551:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):354:361 -> a
-    552:558:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):410:416 -> a
-    559:559:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
-    559:559:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):416 -> a
+    200:203:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
+    200:203:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):255 -> a
+    204:240:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):256:292 -> a
+    241:245:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
+    241:245:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):292 -> a
+    246:246:void lambda$writeClass$0(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):275:275 -> a
+    247:247:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):293:293 -> a
+    248:248:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):297:297 -> a
+    249:255:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):306:312 -> a
+    256:259:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):310:313 -> a
+    260:260:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):311:311 -> a
+    261:264:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):317:320 -> a
+    265:265:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
+    265:265:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    562:565:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
-    562:565:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):416 -> a
-    566:569:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):403:406 -> a
-    566:569:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):417 -> a
-    570:571:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):418:419 -> a
-    572:572:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):496:496 -> a
-    573:582:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):506:515 -> a
-    583:588:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):514:519 -> a
-    589:590:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):525:526 -> a
-    591:649:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):531:589 -> a
-    650:653:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):534:537 -> a
-    654:681:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):536:563 -> a
-    682:692:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):560:570 -> a
-    693:711:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):567:585 -> a
-    712:712:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):583:583 -> a
-    713:713:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):579:579 -> a
-    714:717:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):573:576 -> a
-    1:9:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):138:146 -> b
-    10:20:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):140:150 -> b
-    21:24:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):126:129 -> b
-    21:24:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
-    25:25:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> b
-    25:25:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):129 -> b
-    25:25:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
-    26:26:boolean com.android.tools.r8.dex.Marker.isDexBackend():232:232 -> b
-    26:26:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):129 -> b
-    26:26:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
-    27:28:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):129:130 -> b
-    27:28:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
-    29:29:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> b
-    29:29:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):131 -> b
-    29:29:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
-    30:30:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):131:131 -> b
-    30:30:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
-    31:38:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150:157 -> b
-    39:39:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):223:223 -> b
-    39:39:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):157 -> b
-    40:52:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):159:171 -> b
-    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> b
-    53:53:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):175 -> b
+    266:266:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
+    266:266:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320 -> a
+    267:267:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    268:268:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":612,"2":613,"3":614}}
+    612:612:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    613:613:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    614:614:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
+    589:590:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):321:322 -> a
+    591:591:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1937:1937 -> a
+    591:591:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    54:56:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):177:179 -> b
-    57:61:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):176:180 -> b
-    62:62:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):173:173 -> b
-    63:64:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):161:162 -> b
-    65:65:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> b
-    65:65:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):166 -> b
+    595:595:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1941:1941 -> a
+    595:595:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
+    596:596: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
+    596:596:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1942 -> a
+    596:596:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
+    597:602:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):322:327 -> a
+    603:607:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1937:1941 -> a
+    603:607:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327 -> a
+    608:608: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
+    608:608:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1942 -> a
+    608:608:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327 -> a
+    609:611:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):328:330 -> a
+    615:622:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):348:355 -> a
+    623:629:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):404:410 -> a
+    630:630:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
+    630:630:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):410 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:67:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):167:168 -> b
-    68:87:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):164:183 -> b
-    88:88: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):284:284 -> b
-    89:89:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):307:307 -> b
-    1:9: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):429:437 -> c
-    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():260:260 -> c
-    10:10: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):438 -> c
-    11:14: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):441:444 -> c
-    15:15:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:878 -> c
-    15:15: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):444 -> c
+    633:636:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
+    633:636:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):410 -> a
+    637:640:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):397:400 -> a
+    637:640:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):411 -> a
+    641:642:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):412:413 -> a
+    643:651: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):423:431 -> a
+    652:652:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():260:260 -> a
+    652:652: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):432 -> a
+    653:656: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):435:438 -> a
+    657:657:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:878 -> a
+    657:657: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):438 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:21:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):881:884 -> c
-    18:21: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):444 -> c
-    22:22: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):445:445 -> c
-    23:31:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):389:397 -> c
-    23:31: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):445 -> c
-    32:40: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):446:454 -> c
-    41:54:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):464:477 -> c
-    41:54: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):454 -> c
-    55:57: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):455:457 -> c
-    58:61:void com.android.tools.r8.jar.CfApplicationWriter.writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):600:603 -> c
-    58:61: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):458 -> c
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.A6:
+    660:663:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):881:884 -> a
+    660:663: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):438 -> a
+    664:664: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):439:439 -> a
+    665:673:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):383:391 -> a
+    665:673: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):439 -> a
+    674:682: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):440:448 -> a
+    683:696:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):458:471 -> a
+    683:696: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):448 -> a
+    697:699: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):449:451 -> a
+    700:703:void com.android.tools.r8.jar.CfApplicationWriter.writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):594:597 -> a
+    700:703: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):452 -> a
+    704:704:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):490:490 -> a
+    705:714:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):500:509 -> a
+    715:720:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):508:513 -> a
+    721:722:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):519:520 -> a
+    723:781:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):525:583 -> a
+    782:785:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):528:531 -> a
+    786:813:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):530:557 -> a
+    814:824:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):554:564 -> a
+    825:843:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):561:579 -> a
+    844:844:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):577:577 -> a
+    845:845:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):573:573 -> a
+    846:849:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):567:570 -> a
+    1:1: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):278:278 -> b
+    2:2:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):301:301 -> b
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.z6:
     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.cf:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Xe:
 # {"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.RA:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.KA:
 # {"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
@@ -83147,10 +82768,10 @@
       # {"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.mH:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.cH:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.sL:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.iL:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object first -> b
     java.lang.Object second -> c
@@ -83182,19 +82803,19 @@
     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.t00:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.j00:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.x00:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.n00:
 # {"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.z00:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.p00:
 # {"id":"sourceFile","fileName":"Unit.kt"}
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
     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.U00:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.K00:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> b
     java.lang.Object _value -> c
@@ -83203,7 +82824,7 @@
     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.B30:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.r30:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -83277,7 +82898,7 @@
     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.t3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt -> com.android.tools.r8.internal.s3:
     1:169:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt.asList(int[]):0:168 -> a
     1:169:java.util.List asList(int[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -83318,9 +82939,9 @@
     6:6:java.util.List com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt.toList(int[]):9972:9972 -> b
     6:6: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.u3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.t3:
 # {"id":"sourceFile","fileName":"Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.v3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.u3:
 # {"id":"sourceFile","fileName":"_ArraysJvm.kt"}
     int[] $this_asList -> b
     1:1:void <init>(int[]):168:168 -> <init>
@@ -83347,9 +82968,9 @@
     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.w3:
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.v3:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.bc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.ac:
     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"}
@@ -83477,22 +83098,22 @@
     1327:1327:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):1628:1628 -> b
     1327:1327:java.lang.Iterable withIndex(java.lang.Iterable):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.cc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.bc:
 # {"id":"sourceFile","fileName":"Collections.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.dc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.cc:
 # {"id":"sourceFile","fileName":"IteratorsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.ec:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.dc:
 # {"id":"sourceFile","fileName":"MutableCollectionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.fc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.ec:
 # {"id":"sourceFile","fileName":"ReversedViews.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.hc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.gc:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.gc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.fc:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     java.lang.Iterable $this_withIndex -> b
     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():1628 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.Vh:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.Qh:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> b
     1:1:void <init>():15:15 -> <init>
@@ -83506,7 +83127,7 @@
     1:1:void set(java.lang.Object):15:15 -> set
     2:2:void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.set(java.lang.Void):0:0 -> set
     2:2:void set(java.lang.Object):15 -> set
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.Wh:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.Rh:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> b
     1:1:void <init>():24:24 -> <init>
@@ -83541,7 +83162,7 @@
     2:2:java.lang.Object set(int,java.lang.Object):24 -> set
     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.Xh:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.Sh:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> b
     1:1:void <init>():14:14 -> <init>
@@ -83558,7 +83179,7 @@
     1:1:java.lang.Object remove(java.lang.Object):14 -> remove
     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.Zh:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.Uh:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> b
     1:1:void <init>():14:14 -> <init>
@@ -83572,7 +83193,7 @@
     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.cp:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.Vo:
 # {"id":"sourceFile","fileName":"IndexedValue.kt"}
     java.lang.Object value -> b
     int index -> a
@@ -83585,12 +83206,12 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.dp:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.Wo:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> b
     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.ep:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.Xo:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> c
@@ -83598,7 +83219,7 @@
     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.HD:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.AD:
     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):547:550 -> a
@@ -83619,11 +83240,11 @@
     36:36:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):548:548 -> a
     36:36: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.ID:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.BD:
 # {"id":"sourceFile","fileName":"MapsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.JD:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.CD:
 # {"id":"sourceFile","fileName":"_Maps.kt"}
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.bN:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.RM:
 # {"id":"sourceFile","fileName":"progressionUtil.kt"}
     1:1:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.mod(int,int):10:10 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21 -> a
@@ -83632,60 +83253,60 @@
     2:2:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21 -> a
     2:2:int getProgressionLastElement(int,int,int):47 -> a
     3:3:int getProgressionLastElement(int,int,int):48:48 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.Yv:
+com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.Rv:
 # {"id":"sourceFile","fileName":"JvmClassMapping.kt"}
     1:4:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:61 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.el:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.Zk:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.gl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.bl:
 # {"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.fl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.al:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.hl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.cl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.il:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.dl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.jl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.el:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.kl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.fl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.ll:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.gl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.ml:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.hl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.nl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.il:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.ol:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.jl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.pl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.kl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.ul:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.pl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.rl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.ml:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.sl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.nl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.tl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.ol:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.ql:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.wl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.rl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.xl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.sl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.yl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.tl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.zl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.ul:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.Al:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.vl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.Bl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.wl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.F9:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.E9:
 # {"id":"sourceFile","fileName":"ClassBasedDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.La:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.Ka:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
     java.util.Map FUNCTION_CLASSES -> b
     java.lang.Class jClass -> a
@@ -83716,7 +83337,7 @@
     2:2:java.lang.String toString():97:97 -> toString
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.stringPlus(java.lang.String,java.lang.Object):20:20 -> toString
     3:3:java.lang.String toString():97 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.Xb:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.Wb:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():127:127 -> <clinit>
@@ -83730,7 +83351,7 @@
     251:316:java.lang.Object[] toArray(java.util.Collection):21:86 -> a
     317:399:java.lang.Object[] toArray(java.util.Collection):22:104 -> a
     400:400:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.mu:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.fu:
     1:1:void throwUninitializedPropertyAccessException(java.lang.String):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5,"4":6,"5":7,"6":8}}
     3:3:void throwUninitializedPropertyAccessException(java.lang.String):58:58 -> a
@@ -83763,11 +83384,11 @@
     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.wA:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.pA:
 # {"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.Reflection -> com.android.tools.r8.internal.NR:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.CR:
     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
@@ -83777,11 +83398,11 @@
     4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionBase):44:45 -> a
     4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):39 -> a
     4:5:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):78 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.OR:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.DR:
     1:1:void <init>():14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.ax:
+com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.Tw:
 # {"id":"sourceFile","fileName":"KClass.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.dX:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.TW:
     1:71:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):0:70 -> a
     1:71:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):68 -> a
     1:71:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
@@ -83809,15 +83430,15 @@
     4:4:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):483 -> b
     4:4:java.lang.String substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.eX:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.UW:
 # {"id":"sourceFile","fileName":"Indent.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.fX:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.VW:
 # {"id":"sourceFile","fileName":"RegexExtensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.gX:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.WW:
 # {"id":"sourceFile","fileName":"StringBuilder.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.hX:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.XW:
 # {"id":"sourceFile","fileName":"StringNumberConversions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.iX:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.YW:
 # {"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):1158 -> a
@@ -83849,9 +83470,9 @@
     1108:1108:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):418:418 -> a
     1109:1111:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):654:656 -> a
     1109:1111:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):420 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.jX:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.ZW:
 # {"id":"sourceFile","fileName":"_Strings.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Ak:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.vk:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     int bitWidth -> b
     int value -> c
@@ -83862,31 +83483,31 @@
     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.xk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Property -> com.android.tools.r8.internal.sk:
 # {"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.yk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.tk:
 # {"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.zk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.uk:
 # {"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.Ak$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.vk$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.Hk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.Ck:
 # {"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.Yo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.Ro:
 # {"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.bx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.Uw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.Map arguments -> b
     java.lang.String className -> a
@@ -83899,10 +83520,10 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.dx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.Ww:
 # {"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.cx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.Vw:
 # {"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>
@@ -83913,7 +83534,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.dx$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.Ww$a:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.List elements -> a
     1:1:void <init>(java.util.List):66:66 -> <init>
@@ -83924,7 +83545,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.ex:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.Xw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):44:44 -> <init>
@@ -83949,7 +83570,7 @@
     2:2:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():44:44 -> 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$ByteValue -> com.android.tools.r8.internal.fx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.Yw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):37:37 -> <init>
@@ -83970,7 +83591,7 @@
     2:2:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():37:37 -> 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$CharValue -> com.android.tools.r8.internal.gx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.Zw:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     char value -> a
     1:1:void <init>(char):38:38 -> <init>
@@ -83995,7 +83616,7 @@
     2:2:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():38:38 -> 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$DoubleValue -> com.android.tools.r8.internal.hx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.ax:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     double value -> a
     1:1:void <init>(double):43:43 -> <init>
@@ -84019,7 +83640,7 @@
     2:2:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():43:43 -> 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$EnumValue -> com.android.tools.r8.internal.ix:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.bx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
@@ -84032,7 +83653,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.jx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.cx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     float value -> a
     1:1:void <init>(float):42:42 -> <init>
@@ -84056,7 +83677,7 @@
     2:2:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():42:42 -> 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$IntValue -> com.android.tools.r8.internal.kx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.dx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):40:40 -> <init>
@@ -84081,7 +83702,7 @@
     2:2:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():40:40 -> 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$KClassValue -> com.android.tools.r8.internal.lx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.ex:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String className -> a
     int arrayDimensionCount -> b
@@ -84094,10 +83715,10 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.mx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.fx:
 # {"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.nx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.gx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):41:41 -> <init>
@@ -84122,7 +83743,7 @@
     2:2:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():41:41 -> 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$ShortValue -> com.android.tools.r8.internal.ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.hx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):39:39 -> <init>
@@ -84147,7 +83768,7 @@
     2:2:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():39:39 -> 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$StringValue -> com.android.tools.r8.internal.px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.ix:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):59:59 -> <init>
@@ -84169,7 +83790,7 @@
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():59:59 -> 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$UByteValue -> com.android.tools.r8.internal.qx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.jx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):48:48 -> <init>
@@ -84191,7 +83812,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UByte.toString-impl(byte):343:343 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.rx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.kx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):54:54 -> <init>
@@ -84213,7 +83834,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UInt.toString-impl(int):365:365 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.sx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.lx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):57:57 -> <init>
@@ -84242,7 +83863,7 @@
     12:12:java.lang.String com.android.tools.r8.jetbrains.kotlin.ULong.toString-impl(long):368 -> toString
     12:12:java.lang.String toString():0 -> toString
     13:13:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.tx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.mx:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):51:51 -> <init>
@@ -84264,7 +83885,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UShort.toString-impl(short):344:344 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.ux:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.nx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> q
     java.util.List versionRequirements -> p
@@ -84351,9 +83972,9 @@
     1:1:java.util.List getTypeParameters():49:49 -> p
     1:1:java.util.List getVersionRequirements():109:109 -> q
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():161:161 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.wx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.px:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.xx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.qx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):57:57 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
@@ -84361,10 +83982,10 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor.getDelegate():59:59 -> e
     1:1:void visitEnd():170 -> e
     2:2:void visitEnd():170:170 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.zx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.sx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:void <init>():972:972 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.yx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.rx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):978:978 -> <init>
@@ -84375,7 +83996,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.zx$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.sx$a:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):993:993 -> <init>
@@ -84386,7 +84007,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.zx$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.sx$b:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int id -> a
     1:1:void <init>(int):985:985 -> <init>
@@ -84397,7 +84018,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.Ax:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.tx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Object value -> a
     1:1:void <init>(java.lang.Object):1042:1042 -> <init>
@@ -84408,7 +84029,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.Bx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.ux:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> e
     java.util.List versionRequirements -> d
@@ -84428,9 +84049,9 @@
     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.Dx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.wx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Ex:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.xx:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):263:263 -> <init>
@@ -84439,7 +84060,7 @@
     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.Fx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.yx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List effects -> b
     1:5:void <init>():832:836 -> <init>
@@ -84447,19 +84068,19 @@
     2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):847:847 -> a
     206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):848:848 -> a
     1:1:java.util.List getEffects():836:836 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.Gx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.zx:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):732:732 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):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.Hx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Ax:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List getFunctions() -> a
     java.util.List getProperties() -> b
     java.util.List getTypeAliases() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Ix:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Bx:
 # {"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>
@@ -84467,7 +84088,7 @@
     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.Jx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.Cx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List constructorArguments -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType type -> b
@@ -84483,7 +84104,7 @@
     1:1:java.util.List getConstructorArguments():870:870 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():864:864 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():863:863 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.Kx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.Dx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
@@ -84506,7 +84127,7 @@
     1:1:java.util.List getOrArguments():933:933 -> g
     1:1:java.lang.Integer getParameterIndex():911:911 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType():921:921 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.Lx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.Ex:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):791:791 -> <init>
@@ -84517,7 +84138,7 @@
     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.Mx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.Fx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_LEAST_ONCE -> d
@@ -84529,7 +84150,7 @@
     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.Nx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.Gx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_CONSTANT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_NOT_NULL -> d
@@ -84541,7 +84162,7 @@
     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.Ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.Hx:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):760:760 -> <init>
@@ -84549,7 +84170,7 @@
     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.Qx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.Jx:
 # {"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>
@@ -84561,9 +84182,9 @@
     2:30:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):0:28 -> toString
     2:30:java.lang.String toString():39 -> toString
     31:31:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.Rx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.Kx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.Sx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.Lx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> a
     java.lang.String typeFlexibilityId -> b
@@ -84576,7 +84197,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.Tx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.Mx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List valueParameters -> f
     java.util.List typeParameters -> d
@@ -84615,9 +84236,9 @@
     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.Vx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.Ox:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Wx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Px:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):301:301 -> <init>
@@ -84630,21 +84251,21 @@
     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.Xx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.Qx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction function -> b
     1:1:void <init>():282:282 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):289:289 -> a
     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
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.Yx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.Rx:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):240:240 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):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.Zx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.Sx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List functions -> b
     java.util.List extensions -> e
@@ -84684,9 +84305,9 @@
     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 getTypeAliases():208:208 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.by:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.Ux:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.cy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.Vx:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):179:179 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):179:179 -> <init>
@@ -84694,7 +84315,7 @@
     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.dy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.Wx:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> h
@@ -84733,9 +84354,9 @@
     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.fy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.Yx:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.gy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.Zx:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):373:373 -> <init>
@@ -84747,7 +84368,7 @@
     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.hy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.ay:
 # {"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
@@ -84793,7 +84414,7 @@
     1:1:int getFlags():668:668 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():707:707 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():700:700 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.iy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.by:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType expandedType -> f
@@ -84847,9 +84468,9 @@
     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.ky:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.dy:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.ly:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.ey:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):439:439 -> <init>
@@ -84861,9 +84482,9 @@
     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.ny:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.gy:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.oy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.hy:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List upperBounds -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> e
@@ -84886,9 +84507,9 @@
     1:1:java.lang.String getName():633:633 -> d
     1:1:java.util.List getUpperBounds():640:640 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():635:635 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.qy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.jy:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.ry:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.ky:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):544:544 -> <init>
@@ -84896,7 +84517,7 @@
     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.sy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.ly:
 # {"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
@@ -84913,7 +84534,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.ty:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.my:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):580:580 -> <init>
@@ -84928,7 +84549,7 @@
     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.uy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.ny:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> d
@@ -84950,9 +84571,9 @@
     1:1:java.lang.String getName():584:584 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():590:590 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():595:595 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor -> com.android.tools.r8.internal.wy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor -> com.android.tools.r8.internal.py:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.xy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.qy:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):506:506 -> <init>
@@ -84961,14 +84582,14 @@
     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.yy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.ry:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance INVARIANT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance OUT -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance IN -> 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.zy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.sy:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int minor -> b
     int patch -> c
@@ -84978,7 +84599,7 @@
     1:1:int getMinor():1030:1030 -> b
     1:1:int getPatch():1030:1030 -> c
     1:1:java.lang.String toString():1031:1031 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.Ay:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.ty:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
@@ -85016,7 +84637,7 @@
     21:21:void visitVersion(int,int,int):811 -> a
     1:1:java.lang.Integer getErrorCode():791:791 -> b
     1:1:java.lang.String getMessage():796:796 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.By:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.uy:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel HIDDEN -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel ERROR -> c
@@ -85027,7 +84648,7 @@
     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.Cy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.vy:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind API_VERSION -> d
@@ -85038,7 +84659,7 @@
     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.Dy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.wy:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):691:691 -> <init>
@@ -85046,10 +84667,10 @@
     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.pH:
+com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.fH:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:java.lang.Object addTo(java.lang.Object,java.util.Collection):1045:1045 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.hb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.gb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):413:413 -> <init>
@@ -85101,63 +84722,63 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):288:288 -> h
     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 -> h
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():468 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.Ya:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.Xa:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     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$visitFunction$1 -> com.android.tools.r8.internal.Za:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.Ya:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     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.ab:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1 -> com.android.tools.r8.internal.Za:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     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.bb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.ab:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     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.cb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.bb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     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.db:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.cb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     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.eb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.db:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     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.fb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.eb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     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.OA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.HA:
 # {"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>
@@ -85168,14 +84789,14 @@
     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.NA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.GA:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter this$0 -> b
     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.qL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.gL:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):482:482 -> <init>
@@ -85201,28 +84822,28 @@
     1:2:void visitEnd():501: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$visitFunction$1 -> com.android.tools.r8.internal.nL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.dL:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     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.oL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.eL:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     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.pL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.fL:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     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.LP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.BP:
 # {"id":"sourceFile","fileName":"readers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> b
     java.util.List contextExtensions -> e
@@ -85242,7 +84863,7 @@
     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.NP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.DP:
 # {"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
@@ -85281,10 +84902,10 @@
     213:213:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):74:74 -> a
     213:213:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):57 -> a
     214:214: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.MP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.CP:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     int[] $EnumSwitchMapping$0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.OP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.EP:
 # {"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
@@ -85552,7 +85173,7 @@
     1:1:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):507:507 -> b
     2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getDefaultPropertyAccessorFlags(int):510:510 -> b
     2:2:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):507 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.B20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.r20:
 # {"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
@@ -85562,7 +85183,7 @@
     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.C20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.s20:
 # {"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:8: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$Builder.build():3058:3059 -> a
@@ -85587,10 +85208,10 @@
     92:92:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     92:92: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):99 -> a
     93:96: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):101:104 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.z30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.p30:
 # {"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.F20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.v20:
 # {"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
@@ -85617,7 +85238,7 @@
     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$visitValueParameter$1 -> com.android.tools.r8.internal.D20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.t20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):133:133 -> a
@@ -85636,14 +85257,14 @@
     141:141:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18809:18809 -> a
     141:141: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):133 -> a
     141:141:java.lang.Object invoke(java.lang.Object):133 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.E20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.u20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> b
     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.H20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.x20:
 # {"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
@@ -85655,14 +85276,14 @@
     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.G20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.w20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 this$0 -> b
     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.L20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.B20:
 # {"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
@@ -85684,10 +85305,10 @@
     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.I20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$WhenMappings -> com.android.tools.r8.internal.y20:
 # {"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.J20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.z20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):358:358 -> a
@@ -85706,14 +85327,14 @@
     366:366:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929:25929 -> a
     366:366: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):358 -> a
     366:366:java.lang.Object invoke(java.lang.Object):358 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.K20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.A20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> b
     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.P20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.F20:
 # {"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
@@ -85735,28 +85356,28 @@
     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.M20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.C20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     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.N20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.D20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     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.O20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.E20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     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.X20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.N20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
@@ -85791,7 +85412,7 @@
     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.Q20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.G20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):171:171 -> a
@@ -85810,7 +85431,7 @@
     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():23900:23900 -> 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.R20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.H20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> c
@@ -85818,42 +85439,42 @@
     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.S20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.I20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     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.T20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.J20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     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.U20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.K20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     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.V20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.L20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     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.W20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.M20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     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.e30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.U20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -85886,7 +85507,7 @@
     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.Y20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.O20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -85894,21 +85515,21 @@
     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.Z20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.P20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     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.a30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.Q20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     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.b30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.R20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):199:199 -> a
@@ -85927,21 +85548,21 @@
     207:207:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18809:18809 -> a
     207:207: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):199 -> a
     207:207:java.lang.Object invoke(java.lang.Object):199 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.c30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.S20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     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.d30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.T20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     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.j30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.Z20:
 # {"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
@@ -85980,14 +85601,14 @@
     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.f30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.V20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
     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.g30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.W20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
@@ -85997,7 +85618,7 @@
     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$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.h30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.X20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     java.lang.String $typeFlexibilityId -> b
@@ -86006,14 +85627,14 @@
     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.i30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.Y20:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
     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.p30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.f30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
@@ -86041,14 +85662,14 @@
     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.k30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.a30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     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.l30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.b30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -86056,28 +85677,28 @@
     1:1:java.lang.Object invoke(java.lang.Object):273:273 -> a
     2:276: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):0:274 -> a
     2:276: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.m30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.c30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     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.n30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.d30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     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.o30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.e30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     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.r30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.h30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -86103,14 +85724,14 @@
     51:51:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43 -> a
     52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43:43 -> a
     53:64:void visitEnd():48:59 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.q30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.g30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> b
     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.v30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.l30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
@@ -86129,7 +85750,7 @@
     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.s30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.i30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> c
@@ -86137,21 +85758,21 @@
     1:1:java.lang.Object invoke(java.lang.Object):237:237 -> a
     2:240: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):0:238 -> a
     2:240: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.t30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.j30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> b
     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.u30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.k30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> b
     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.y30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.o30:
 # {"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
@@ -86174,61 +85795,61 @@
     33:36:void visitEnd():329:332 -> a
     37:37: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.w30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.m30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):322:322 -> 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):322 -> a
     3:3:java.lang.Object invoke(java.lang.Object):322:322 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.x30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.n30:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):322:322 -> 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):322 -> a
     3:3:java.lang.Object invoke(java.lang.Object):322:322 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.oj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.jj:
 # {"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.vx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.ox:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Cx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.vx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.Px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.Ix:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
     void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Ux:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Nx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.ay:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.Tx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.ey:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.Xx:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.jy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.cy:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.my:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.fy:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.py:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.iy:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.vy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.oy:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.kE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.dE:
 # {"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.jE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.cE:
 # {"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.iE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.bE:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> b
     1:3:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2.invoke():85:87 -> a
     1:3:java.lang.Object invoke():84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.KN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.AN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List argument_ -> e
     int memoizedSerializedSize -> g
@@ -86282,11 +85903,11 @@
     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.BN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.rN:
     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.IN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.yN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -86333,11 +85954,11 @@
     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.CN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.sN:
     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.DN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.tN:
     int nameId_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> e
     int bitField0_ -> c
@@ -86388,7 +86009,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> g
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument build():3986 -> g
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument build():3986:3986 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.HN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.xN:
     int flags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -86502,11 +86123,11 @@
     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.EN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.uN:
     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.FN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.vN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type type_ -> d
     int flags_ -> n
     int arrayDimensionCount_ -> m
@@ -86580,7 +86201,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.create():3019:3019 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder access$2100():3005 -> f
     1:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3114 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.GN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.wN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> p
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> c
@@ -86614,7 +86235,7 @@
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> a
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] values():2416:2416 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.JN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.zN:
     java.util.List argument_ -> e
     int id_ -> d
     int bitField0_ -> c
@@ -86647,7 +86268,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.create():4348:4348 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder access$4200():4334 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.ON:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.EN:
     java.util.List enumEntry_ -> r
     java.util.List property_ -> p
     int fqName_ -> f
@@ -86847,11 +86468,11 @@
     1:1:java.util.List getSupertypeIdList():9110:9110 -> x
     1:1:java.util.List getSupertypeList():9074:9074 -> y
     1:1:java.util.List getTypeAliasList():9260:9260 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.LN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.BN:
     1:1:void <init>():8838:8838 -> <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):8843:8843 -> 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):8838 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.MN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.CN:
     java.util.List sealedSubclassFqName_ -> r
     java.util.List enumEntry_ -> q
     java.util.List typeAlias_ -> p
@@ -87059,7 +86680,7 @@
     2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setFqName(int):10319:10320 -> f
     1:91:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class buildPartial():9897:9987 -> g
     92:93:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setInlineClassUnderlyingPropertyName(int):11456:11457 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.NN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.DN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind INTERFACE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind CLASS -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind COMPANION_OBJECT -> i
@@ -87074,7 +86695,7 @@
     1:2:void <init>(java.lang.String,int,int,int):8954:8955 -> <init>
     1:1:int getNumber():8925:8925 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8855:8855 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.RN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.HN:
     java.util.List valueParameter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor defaultInstance -> j
     int memoizedSerializedSize -> i
@@ -87134,11 +86755,11 @@
     1:1:boolean hasFlags():13802:13802 -> o
     1:3:void initFields():13888:13890 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():14020:14020 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.PN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.FN:
     1:1:void <init>():13774:13774 -> <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):13779:13779 -> 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):13774 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.QN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.GN:
     int flags_ -> f
     java.util.List versionRequirement_ -> h
     int bitField0_ -> e
@@ -87180,7 +86801,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.create():14043:14043 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12800():14030 -> f
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():14074:14091 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.UN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.KN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -87229,11 +86850,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23860 -> 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):23858:23858 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23860 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.SN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.IN:
     1:1:void <init>():23703:23703 -> <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):23708:23708 -> 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):23703 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.TN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.JN:
     java.util.List effect_ -> d
     int bitField0_ -> c
     1:91:void <init>():23872:23962 -> <init>
@@ -87275,7 +86896,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.create():23879:23879 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22600():23865 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23906:23912 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.ZN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.PN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List effectConstructorArgument_ -> e
@@ -87337,11 +86958,11 @@
     1:1:boolean hasKind():24530:24530 -> n
     1:4:void initFields():24540:24543 -> o
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24672:24672 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.VN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.LN:
     1:1:void <init>():24270:24270 -> <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):24275:24275 -> 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):24270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.WN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.MN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> d
     java.util.List effectConstructorArgument_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> f
@@ -87401,7 +87022,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.create():24696:24696 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$23100():24682 -> f
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24729:24749 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.XN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.NN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_CONSTANT -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType CALLS -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> e
@@ -87414,7 +87035,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24357:24357 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24356:24356 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24355:24355 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.YN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.ON:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind[] $VALUES -> f
     int value -> b
@@ -87427,7 +87048,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24422:24422 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24421:24421 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24420:24420 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.cO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.SN:
     int memoizedSerializedSize -> g
     int bitField0_ -> d
     int name_ -> e
@@ -87471,11 +87092,11 @@
     1:1:boolean hasName():20864:20864 -> m
     1:1:void initFields():20874:20874 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20979:20979 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.aO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.QN:
     1:1:void <init>():20843:20843 -> <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):20848:20848 -> 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):20843 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.bO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.RN:
     int name_ -> f
     int bitField0_ -> e
     1:1:void <init>():20995:20995 -> <init>
@@ -87514,7 +87135,7 @@
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.AbstractMessageLite$Builder.newUninitializedMessageException(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):316:316 -> g
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry build():21023 -> g
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry build():21023:21023 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.gO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.WN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression defaultInstance -> m
@@ -87601,11 +87222,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25872 -> 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):25870:25870 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25872 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.dO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.TN:
     1:1:void <init>():25389:25389 -> <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):25394:25394 -> 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):25389 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.eO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.UN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> g
     int isInstanceTypeId_ -> h
     java.util.List orArgument_ -> j
@@ -87689,7 +87310,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.create():25896:25896 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$24000():25882 -> f
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25935:25968 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.fO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.VN:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue FALSE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> f
@@ -87702,7 +87323,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25442:25442 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25441:25441 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25440:25440 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.jO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.ZN:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> s
@@ -87824,11 +87445,11 @@
     1:1:boolean hasContract():15086:15086 -> x
     1:1:boolean hasFlags():14847:14847 -> y
     1:1:boolean hasName():14892:14892 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.hO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.XN:
     1:1:void <init>():14811:14811 -> <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):14816:14816 -> 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):14811 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.iO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.YN:
     java.util.List versionRequirement_ -> p
     int receiverTypeId_ -> m
     int returnTypeId_ -> j
@@ -87968,7 +87589,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.create():15357:15357 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder access$13600():15344 -> f
     1:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function buildPartial():15406:15460 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.kO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.aO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind DELEGATION -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] $VALUES -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind SYNTHESIZED -> f
@@ -87980,7 +87601,7 @@
     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.lO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.bO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality SEALED -> f
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality OPEN -> d
@@ -87992,7 +87613,7 @@
     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.oO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.eO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package defaultInstance -> l
@@ -88071,11 +87692,11 @@
     1:1:boolean hasVersionRequirementTable():12123:12123 -> r
     1:5:void initFields():12133:12137 -> s
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():12294:12294 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.mO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.cO:
     1:1:void <init>():11982:11982 -> <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):11987:11987 -> 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):11982 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.nO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.dO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> j
     java.util.List function_ -> f
@@ -88182,7 +87803,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.create():12317:12317 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$11100():12304 -> f
     1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12352:12378 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.rO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.hO:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -88296,11 +87917,11 @@
     1:1:boolean hasFlags():16817:16817 -> x
     1:1:boolean hasGetterFlags():17000:17000 -> y
     1:1:boolean hasName():16863:16863 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.pO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.fO:
     1:1:void <init>():16780:16780 -> <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):16785:16785 -> 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):16780 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.qO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.gO:
     int getterFlags_ -> o
     java.util.List versionRequirement_ -> q
     int receiverTypeId_ -> m
@@ -88413,7 +88034,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.create():17320:17320 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15300():17307 -> f
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17369:17422 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.yO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.oO:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -88544,11 +88165,11 @@
     1:1:int getTypeParameter():5809:5809 -> x
     1:1:int getTypeParameterName():5832:5832 -> y
     1:1:boolean hasAbbreviatedType():5904:5904 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.sO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.iO:
     1:1:void <init>():4974:4974 -> <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):4979:4979 -> 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):4974 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.wO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.mO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument defaultInstance -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> h
@@ -88600,11 +88221,11 @@
     1:1:boolean hasTypeId():5259:5259 -> m
     1:3:void initFields():5269:5271 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5387:5387 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.tO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.jO:
     1:1:void <init>():5126:5126 -> <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):5131:5131 -> 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):5126 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.uO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.kO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> e
     int typeId_ -> f
@@ -88648,7 +88269,7 @@
     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():5411:5411 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5397 -> f
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5442:5457 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.vO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.lO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection INV -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection STAR -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> c
@@ -88663,7 +88284,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5187:5187 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5186:5186 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.xO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.nO:
     int typeAliasName_ -> n
     int typeParameter_ -> l
     int typeParameterName_ -> m
@@ -88778,7 +88399,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6257 -> g
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6257:6257 -> g
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6263:6323 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.BO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.rO:
     int memoizedSerializedSize -> o
     int expandedTypeId_ -> k
     int underlyingTypeId_ -> i
@@ -88879,11 +88500,11 @@
     1:1:boolean hasName():19532:19532 -> x
     1:1:boolean hasUnderlyingType():19582:19582 -> y
     1:1:boolean hasUnderlyingTypeId():19597:19597 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.zO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.pO:
     1:1:void <init>():19486:19486 -> <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):19491:19491 -> 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):19486 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.AO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.qO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> k
     int expandedTypeId_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> i
@@ -88989,7 +88610,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.create():19931:19931 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$18100():19918 -> f
     1:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():19974:20016 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.FO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.vO:
     int memoizedSerializedSize -> m
     int upperBoundIdMemoizedSerializedSize -> k
     int name_ -> f
@@ -89071,11 +88692,11 @@
     1:1:boolean hasVariance():7518:7518 -> u
     1:6:void initFields():7586:7591 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7759:7759 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.CO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.sO:
     1:1:void <init>():7387:7387 -> <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):7392:7392 -> 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):7387 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.DO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.tO:
     int id_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance variance_ -> i
     java.util.List upperBound_ -> j
@@ -89120,7 +88741,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.create():7782:7782 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$7600():7769 -> f
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7819:7848 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.EO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.uO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> f
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance INV -> e
@@ -89133,7 +88754,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7440:7440 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7439:7439 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7438:7438 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.IO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.yO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List type_ -> d
     int memoizedSerializedSize -> g
@@ -89186,11 +88807,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13296 -> 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):13294:13294 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13296 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.GO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.wO:
     1:1:void <init>():13105:13105 -> <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):13110:13110 -> 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):13105 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.HO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.xO:
     java.util.List type_ -> d
     int firstNullable_ -> e
     int bitField0_ -> c
@@ -89222,7 +88843,7 @@
     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():13315:13315 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$12100():13301 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13344:13356 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.LO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.BO:
     int memoizedSerializedSize -> l
     byte memoizedIsInitialized -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
@@ -89299,11 +88920,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18760 -> 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):18758:18758 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18760 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.JO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.zO:
     1:1:void <init>():18474:18474 -> <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):18479:18479 -> 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):18474 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.KO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.AO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> j
     int varargElementTypeId_ -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> h
@@ -89369,7 +88990,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.create():18778:18778 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$17000():18765 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18815:18842 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.QO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.GO:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -89433,11 +89054,11 @@
     1:1:boolean hasVersionKind():21625:21625 -> s
     1:6:void initFields():21640:21645 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21776:21776 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.MO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.CO:
     1:1:void <init>():21348:21348 -> <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):21353:21353 -> 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):21348 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.NO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.DO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
     int message_ -> h
     int errorCode_ -> g
@@ -89473,7 +89094,7 @@
     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():21800:21800 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$20100():21786 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21837:21864 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.OO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.EO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level WARNING -> c
@@ -89486,7 +89107,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21401:21401 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21400:21400 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21399:21399 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.PO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.FO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> d
@@ -89499,7 +89120,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21466:21466 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21465:21465 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21464:21464 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.TO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.JO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List requirement_ -> c
@@ -89544,11 +89165,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22486 -> 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):22484:22484 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22486 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.RO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.HO:
     1:1:void <init>():22335:22335 -> <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):22340:22340 -> 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):22335 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.SO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.IO:
     java.util.List requirement_ -> d
     int bitField0_ -> c
     1:85:void <init>():22498:22582 -> <init>
@@ -89587,7 +89208,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.create():22505:22505 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$21200():22491 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22532:22538 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.UO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.KO:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility[] $VALUES -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility LOCAL -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PRIVATE_TO_THIS -> g
@@ -89601,7 +89222,7 @@
     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.Y4:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.X4:
 # {"id":"sourceFile","fileName":"BinaryVersion.kt"}
     java.util.List rest -> e
     int patch -> d
@@ -89611,10 +89232,10 @@
     1:9:void <init>(int[]):17:25 -> <init>
     10:10:void <init>(int[]):23:23 -> <init>
     11:11:void <init>(int[]):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":40,"2":41,"3":42}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":39,"2":40,"3":41}}
+    39:39:void <init>(int[]):23:23 -> <init>
     40:40:void <init>(int[]):23:23 -> <init>
     41:41:void <init>(int[]):23:23 -> <init>
-    42:42:void <init>(int[]):23:23 -> <init>
     34:37:void <init>(int[]):23:26 -> <init>
     38:38:void <init>(int[]):21:21 -> <init>
     1:1:int getMajor():18:18 -> a
@@ -89627,7 +89248,7 @@
     1:1:java.lang.String toString():70 -> toString
     2:6:java.lang.String toString():99:103 -> toString
     7:7:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.Gk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.Bk:
     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
@@ -89732,14 +89353,14 @@
     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$BooleanFlagField -> com.android.tools.r8.internal.Dk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.yk:
     1:1:void <init>(int):269:269 -> <init>
     java.lang.Object get(int) -> a
     1:1: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.Ek:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.zk:
     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
@@ -89751,22 +89372,22 @@
     307:307:int bitWidth(java.lang.Object[]):300:300 -> a
     311:315: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
     311:315:java.lang.Object get(int):286 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Fk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Ak:
     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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.mG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.fG:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.VO:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.LO:
 # {"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.zP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.pP:
 # {"id":"sourceFile","fileName":"protoTypeTableUtil.kt"}
     1:3: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 -> a
     4:6: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.j00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.ZZ:
 # {"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>
@@ -89774,7 +89395,7 @@
     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.z10:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.p10:
 # {"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
@@ -89794,18 +89415,18 @@
     249:249:java.lang.String toString():81:81 -> toString
     82:82:java.lang.String toString():81:81 -> toString
     83:83:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":250,"2":251,"3":252}}
-    250:250:java.lang.String toString():81:81 -> toString
-    251:251:java.lang.String toString():81:81 -> toString
-    252:252:java.lang.String toString():81:81 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":247,"2":248,"3":249}}
+    247:247:java.lang.String toString():81:81 -> toString
+    248:248:java.lang.String toString():81:81 -> toString
+    249:249:java.lang.String toString():81:81 -> toString
     164:164:java.lang.String toString():81:81 -> toString
     165:165:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":253,"2":254,"3":255}}
-    253:253:java.lang.String toString():81:81 -> toString
-    254:254:java.lang.String toString():81:81 -> toString
-    255:255:java.lang.String toString():81:81 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":247,"2":248,"3":249}}
+    247:247:java.lang.String toString():81:81 -> toString
+    248:248:java.lang.String toString():81:81 -> toString
+    249:249:java.lang.String toString():81:81 -> toString
     246:246:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.y10:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.o10:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     int minor -> b
     int patch -> c
@@ -89820,7 +89441,7 @@
     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.A10:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.q10:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable EMPTY -> b
@@ -89837,7 +89458,7 @@
     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.jvm.JvmProtoBuf -> com.android.tools.r8.internal.Sw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.Lw:
     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
@@ -89853,7 +89474,7 @@
     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>():3965:4197 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.Ew:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.xw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -89902,11 +89523,11 @@
     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.Cw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.vw:
     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.Dw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.ww:
     int name_ -> d
     int desc_ -> e
     int bitField0_ -> c
@@ -89934,7 +89555,7 @@
     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.Hw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.Aw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -89983,11 +89604,11 @@
     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.Fw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.yw:
     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.Gw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.zw:
     int name_ -> d
     int desc_ -> e
     int bitField0_ -> c
@@ -90015,7 +89636,7 @@
     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.Kw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.Dw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> f
     byte memoizedIsInitialized -> i
@@ -90074,11 +89695,11 @@
     1:1:boolean hasSyntheticMethod():3265:3265 -> q
     1:5:void initFields():3334:3338 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3462:3462 -> s
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.Iw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.Bw:
     1:1:void <init>():3225:3225 -> <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):3230:3230 -> 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):3225 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.Jw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.Cw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> g
@@ -90172,7 +89793,7 @@
     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():3486:3486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3472 -> f
     1:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3521:3544 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.Rw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.Kw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes defaultInstance -> h
     java.util.List localName_ -> d
@@ -90222,11 +89843,11 @@
     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.Lw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.Ew:
     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.Mw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.Fw:
     java.util.List localName_ -> e
     java.util.List record_ -> d
     int bitField0_ -> c
@@ -90276,7 +89897,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.create():1776:1776 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1762 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1805:1816 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.Qw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.Jw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> m
     java.lang.Object string_ -> f
@@ -90380,11 +90001,11 @@
     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.Nw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.Gw:
     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.Ow:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.Hw:
     java.lang.Object string_ -> f
     java.util.List replaceChar_ -> i
     int range_ -> d
@@ -90428,7 +90049,7 @@
     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.Pw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.Iw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] $VALUES -> f
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation DESC_TO_CLASS_ID -> e
@@ -90441,7 +90062,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):544:544 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.g5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.f5:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -90507,96 +90128,96 @@
     173:173:byte[] decodeBytes(java.lang.String[]):191 -> a
     174:190:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding.decode7to8(byte[]):247:263 -> a
     174:190:byte[] decodeBytes(java.lang.String[]):192 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.pa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.oa:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map map -> b
     java.lang.String kotlin -> a
     1:15:void <clinit>():17:31 -> <clinit>
     16:29:void <clinit>():23:36 -> <clinit>
     30:30:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":476,"2":477,"3":478}}
-    476:476:void <clinit>():36:36 -> <clinit>
-    477:477:void <clinit>():36:36 -> <clinit>
-    478:478:void <clinit>():36:36 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465}}
+    463:463:void <clinit>():36:36 -> <clinit>
+    464:464:void <clinit>():36:36 -> <clinit>
+    465:465:void <clinit>():36:36 -> <clinit>
     66:79:void <clinit>():36:49 -> <clinit>
     80:80:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":492,"2":493,"3":494,"4":495,"5":496}}
-    492:492:void <clinit>():50:50 -> <clinit>
-    493:493:void <clinit>():50:50 -> <clinit>
-    494:494:void <clinit>():50:50 -> <clinit>
-    495:495:void <clinit>():50:50 -> <clinit>
-    496:496:void <clinit>():50:50 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():50:50 -> <clinit>
+    464:464:void <clinit>():50:50 -> <clinit>
+    465:465:void <clinit>():50:50 -> <clinit>
+    466:466:void <clinit>():50:50 -> <clinit>
+    467:467:void <clinit>():50:50 -> <clinit>
     130:133:void <clinit>():50:53 -> <clinit>
     134:134:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":500,"2":501,"3":502,"4":503,"5":504}}
-    500:500:void <clinit>():54:54 -> <clinit>
-    501:501:void <clinit>():54:54 -> <clinit>
-    502:502:void <clinit>():54:54 -> <clinit>
-    503:503:void <clinit>():54:54 -> <clinit>
-    504:504:void <clinit>():54:54 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():54:54 -> <clinit>
+    464:464:void <clinit>():54:54 -> <clinit>
+    465:465:void <clinit>():54:54 -> <clinit>
+    466:466:void <clinit>():54:54 -> <clinit>
+    467:467:void <clinit>():54:54 -> <clinit>
     135:135:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":505,"2":506,"3":507,"4":508,"5":509}}
-    505:505:void <clinit>():54:54 -> <clinit>
-    506:506:void <clinit>():54:54 -> <clinit>
-    507:507:void <clinit>():54:54 -> <clinit>
-    508:508:void <clinit>():54:54 -> <clinit>
-    509:509:void <clinit>():54:54 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():54:54 -> <clinit>
+    464:464:void <clinit>():54:54 -> <clinit>
+    465:465:void <clinit>():54:54 -> <clinit>
+    466:466:void <clinit>():54:54 -> <clinit>
+    467:467:void <clinit>():54:54 -> <clinit>
     189:189:void <clinit>():54:54 -> <clinit>
     190:190:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":510,"2":511,"3":512,"4":513,"5":514}}
-    510:510:void <clinit>():55:55 -> <clinit>
-    511:511:void <clinit>():55:55 -> <clinit>
-    512:512:void <clinit>():55:55 -> <clinit>
-    513:513:void <clinit>():55:55 -> <clinit>
-    514:514:void <clinit>():55:55 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():55:55 -> <clinit>
+    464:464:void <clinit>():55:55 -> <clinit>
+    465:465:void <clinit>():55:55 -> <clinit>
+    466:466:void <clinit>():55:55 -> <clinit>
+    467:467:void <clinit>():55:55 -> <clinit>
     191:191:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":515,"2":516,"3":517,"4":518,"5":519}}
-    515:515:void <clinit>():55:55 -> <clinit>
-    516:516:void <clinit>():55:55 -> <clinit>
-    517:517:void <clinit>():55:55 -> <clinit>
-    518:518:void <clinit>():55:55 -> <clinit>
-    519:519:void <clinit>():55:55 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():55:55 -> <clinit>
+    464:464:void <clinit>():55:55 -> <clinit>
+    465:465:void <clinit>():55:55 -> <clinit>
+    466:466:void <clinit>():55:55 -> <clinit>
+    467:467:void <clinit>():55:55 -> <clinit>
     246:252:void <clinit>():55:61 -> <clinit>
     253:253:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":528,"2":529,"3":530,"4":531,"5":532}}
-    528:528:void <clinit>():64:64 -> <clinit>
-    529:529:void <clinit>():64:64 -> <clinit>
-    530:530:void <clinit>():64:64 -> <clinit>
-    531:531:void <clinit>():64:64 -> <clinit>
-    532:532:void <clinit>():64:64 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():64:64 -> <clinit>
+    464:464:void <clinit>():64:64 -> <clinit>
+    465:465:void <clinit>():64:64 -> <clinit>
+    466:466:void <clinit>():64:64 -> <clinit>
+    467:467:void <clinit>():64:64 -> <clinit>
     317:317:void <clinit>():64:64 -> <clinit>
     318:318:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":533,"2":534,"3":535,"4":536,"5":537}}
-    533:533:void <clinit>():65:65 -> <clinit>
-    534:534:void <clinit>():65:65 -> <clinit>
-    535:535:void <clinit>():65:65 -> <clinit>
-    536:536:void <clinit>():65:65 -> <clinit>
-    537:537:void <clinit>():65:65 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():65:65 -> <clinit>
+    464:464:void <clinit>():65:65 -> <clinit>
+    465:465:void <clinit>():65:65 -> <clinit>
+    466:466:void <clinit>():65:65 -> <clinit>
+    467:467:void <clinit>():65:65 -> <clinit>
     319:319:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":538,"2":539,"3":540,"4":541,"5":542}}
-    538:538:void <clinit>():65:65 -> <clinit>
-    539:539:void <clinit>():65:65 -> <clinit>
-    540:540:void <clinit>():65:65 -> <clinit>
-    541:541:void <clinit>():65:65 -> <clinit>
-    542:542:void <clinit>():65:65 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():65:65 -> <clinit>
+    464:464:void <clinit>():65:65 -> <clinit>
+    465:465:void <clinit>():65:65 -> <clinit>
+    466:466:void <clinit>():65:65 -> <clinit>
+    467:467:void <clinit>():65:65 -> <clinit>
     384:389:void <clinit>():65:70 -> <clinit>
     390:390:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":548,"2":549,"3":550,"4":551,"5":552}}
-    548:548:void <clinit>():71:71 -> <clinit>
-    549:549:void <clinit>():71:71 -> <clinit>
-    550:550:void <clinit>():71:71 -> <clinit>
-    551:551:void <clinit>():71:71 -> <clinit>
-    552:552:void <clinit>():71:71 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":463,"2":464,"3":465,"4":466,"5":467}}
+    463:463:void <clinit>():71:71 -> <clinit>
+    464:464:void <clinit>():71:71 -> <clinit>
+    465:465:void <clinit>():71:71 -> <clinit>
+    466:466:void <clinit>():71:71 -> <clinit>
+    467:467:void <clinit>():71:71 -> <clinit>
     461:461:void <clinit>():71:71 -> <clinit>
     462:462:void <clinit>():22:22 -> <clinit>
     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.kw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.dw:
 # {"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.hw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.aw:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -90625,7 +90246,7 @@
     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.iw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.bw:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -90654,7 +90275,7 @@
     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.vw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.ow:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
@@ -90662,7 +90283,7 @@
     1:1:void <init>(int[],boolean):14:14 -> <init>
     2:2:void <init>(int[]):15:15 -> <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.xw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.qw:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.util.Set localNameIndices -> c
     java.util.List PREDEFINED_STRINGS -> e
@@ -90680,348 +90301,348 @@
     4469:4469:void <clinit>():84:84 -> <clinit>
     89:89:void <clinit>():84:84 -> <clinit>
     90:90:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4470,"2":4471,"3":4472,"4":4473,"5":4474}}
-    4470:4470:void <clinit>():85:85 -> <clinit>
-    4471:4471:void <clinit>():85:85 -> <clinit>
-    4472:4472:void <clinit>():85:85 -> <clinit>
-    4473:4473:void <clinit>():85:85 -> <clinit>
-    4474:4474:void <clinit>():85:85 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():85:85 -> <clinit>
+    4466:4466:void <clinit>():85:85 -> <clinit>
+    4467:4467:void <clinit>():85:85 -> <clinit>
+    4468:4468:void <clinit>():85:85 -> <clinit>
+    4469:4469:void <clinit>():85:85 -> <clinit>
     175:175:void <clinit>():85:85 -> <clinit>
     176:176:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4475,"2":4476,"3":4477,"4":4478,"5":4479}}
-    4475:4475:void <clinit>():86:86 -> <clinit>
-    4476:4476:void <clinit>():86:86 -> <clinit>
-    4477:4477:void <clinit>():86:86 -> <clinit>
-    4478:4478:void <clinit>():86:86 -> <clinit>
-    4479:4479:void <clinit>():86:86 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():86:86 -> <clinit>
+    4466:4466:void <clinit>():86:86 -> <clinit>
+    4467:4467:void <clinit>():86:86 -> <clinit>
+    4468:4468:void <clinit>():86:86 -> <clinit>
+    4469:4469:void <clinit>():86:86 -> <clinit>
     262:262:void <clinit>():86:86 -> <clinit>
     263:263:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4480,"2":4481,"3":4482,"4":4483,"5":4484}}
-    4480:4480:void <clinit>():87:87 -> <clinit>
-    4481:4481:void <clinit>():87:87 -> <clinit>
-    4482:4482:void <clinit>():87:87 -> <clinit>
-    4483:4483:void <clinit>():87:87 -> <clinit>
-    4484:4484:void <clinit>():87:87 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():87:87 -> <clinit>
+    4466:4466:void <clinit>():87:87 -> <clinit>
+    4467:4467:void <clinit>():87:87 -> <clinit>
+    4468:4468:void <clinit>():87:87 -> <clinit>
+    4469:4469:void <clinit>():87:87 -> <clinit>
     350:350:void <clinit>():87:87 -> <clinit>
     351:351:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4485,"2":4486,"3":4487,"4":4488,"5":4489}}
-    4485:4485:void <clinit>():88:88 -> <clinit>
-    4486:4486:void <clinit>():88:88 -> <clinit>
-    4487:4487:void <clinit>():88:88 -> <clinit>
-    4488:4488:void <clinit>():88:88 -> <clinit>
-    4489:4489:void <clinit>():88:88 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():88:88 -> <clinit>
+    4466:4466:void <clinit>():88:88 -> <clinit>
+    4467:4467:void <clinit>():88:88 -> <clinit>
+    4468:4468:void <clinit>():88:88 -> <clinit>
+    4469:4469:void <clinit>():88:88 -> <clinit>
     439:439:void <clinit>():88:88 -> <clinit>
     440:440:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4491,"2":4492,"3":4493,"4":4494,"5":4495}}
-    4491:4491:void <clinit>():90:90 -> <clinit>
-    4492:4492:void <clinit>():90:90 -> <clinit>
-    4493:4493:void <clinit>():90:90 -> <clinit>
-    4494:4494:void <clinit>():90:90 -> <clinit>
-    4495:4495:void <clinit>():90:90 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():90:90 -> <clinit>
+    4466:4466:void <clinit>():90:90 -> <clinit>
+    4467:4467:void <clinit>():90:90 -> <clinit>
+    4468:4468:void <clinit>():90:90 -> <clinit>
+    4469:4469:void <clinit>():90:90 -> <clinit>
     530:530:void <clinit>():90:90 -> <clinit>
     531:531:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4496,"2":4497,"3":4498,"4":4499,"5":4500}}
-    4496:4496:void <clinit>():90:90 -> <clinit>
-    4497:4497:void <clinit>():90:90 -> <clinit>
-    4498:4498:void <clinit>():90:90 -> <clinit>
-    4499:4499:void <clinit>():90:90 -> <clinit>
-    4500:4500:void <clinit>():90:90 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():90:90 -> <clinit>
+    4466:4466:void <clinit>():90:90 -> <clinit>
+    4467:4467:void <clinit>():90:90 -> <clinit>
+    4468:4468:void <clinit>():90:90 -> <clinit>
+    4469:4469:void <clinit>():90:90 -> <clinit>
     621:621:void <clinit>():90:90 -> <clinit>
     622:622:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4501,"2":4502,"3":4503,"4":4504,"5":4505}}
-    4501:4501:void <clinit>():90:90 -> <clinit>
-    4502:4502:void <clinit>():90:90 -> <clinit>
-    4503:4503:void <clinit>():90:90 -> <clinit>
-    4504:4504:void <clinit>():90:90 -> <clinit>
-    4505:4505:void <clinit>():90:90 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():90:90 -> <clinit>
+    4466:4466:void <clinit>():90:90 -> <clinit>
+    4467:4467:void <clinit>():90:90 -> <clinit>
+    4468:4468:void <clinit>():90:90 -> <clinit>
+    4469:4469:void <clinit>():90:90 -> <clinit>
     712:712:void <clinit>():90:90 -> <clinit>
     713:713:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4506,"2":4507,"3":4508,"4":4509,"5":4510}}
-    4506:4506:void <clinit>():90:90 -> <clinit>
-    4507:4507:void <clinit>():90:90 -> <clinit>
-    4508:4508:void <clinit>():90:90 -> <clinit>
-    4509:4509:void <clinit>():90:90 -> <clinit>
-    4510:4510:void <clinit>():90:90 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():90:90 -> <clinit>
+    4466:4466:void <clinit>():90:90 -> <clinit>
+    4467:4467:void <clinit>():90:90 -> <clinit>
+    4468:4468:void <clinit>():90:90 -> <clinit>
+    4469:4469:void <clinit>():90:90 -> <clinit>
     803:803:void <clinit>():90:90 -> <clinit>
     804:804:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4511,"2":4512,"3":4513,"4":4514,"5":4515}}
-    4511:4511:void <clinit>():91:91 -> <clinit>
-    4512:4512:void <clinit>():91:91 -> <clinit>
-    4513:4513:void <clinit>():91:91 -> <clinit>
-    4514:4514:void <clinit>():91:91 -> <clinit>
-    4515:4515:void <clinit>():91:91 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():91:91 -> <clinit>
+    4466:4466:void <clinit>():91:91 -> <clinit>
+    4467:4467:void <clinit>():91:91 -> <clinit>
+    4468:4468:void <clinit>():91:91 -> <clinit>
+    4469:4469:void <clinit>():91:91 -> <clinit>
     895:895:void <clinit>():91:91 -> <clinit>
     896:896:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4516,"2":4517,"3":4518,"4":4519,"5":4520}}
-    4516:4516:void <clinit>():91:91 -> <clinit>
-    4517:4517:void <clinit>():91:91 -> <clinit>
-    4518:4518:void <clinit>():91:91 -> <clinit>
-    4519:4519:void <clinit>():91:91 -> <clinit>
-    4520:4520:void <clinit>():91:91 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():91:91 -> <clinit>
+    4466:4466:void <clinit>():91:91 -> <clinit>
+    4467:4467:void <clinit>():91:91 -> <clinit>
+    4468:4468:void <clinit>():91:91 -> <clinit>
+    4469:4469:void <clinit>():91:91 -> <clinit>
     987:987:void <clinit>():91:91 -> <clinit>
     988:988:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4521,"2":4522,"3":4523,"4":4524,"5":4525}}
-    4521:4521:void <clinit>():91:91 -> <clinit>
-    4522:4522:void <clinit>():91:91 -> <clinit>
-    4523:4523:void <clinit>():91:91 -> <clinit>
-    4524:4524:void <clinit>():91:91 -> <clinit>
-    4525:4525:void <clinit>():91:91 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():91:91 -> <clinit>
+    4466:4466:void <clinit>():91:91 -> <clinit>
+    4467:4467:void <clinit>():91:91 -> <clinit>
+    4468:4468:void <clinit>():91:91 -> <clinit>
+    4469:4469:void <clinit>():91:91 -> <clinit>
     1079:1079:void <clinit>():91:91 -> <clinit>
     1080:1080:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4526,"2":4527,"3":4528,"4":4529,"5":4530}}
-    4526:4526:void <clinit>():91:91 -> <clinit>
-    4527:4527:void <clinit>():91:91 -> <clinit>
-    4528:4528:void <clinit>():91:91 -> <clinit>
-    4529:4529:void <clinit>():91:91 -> <clinit>
-    4530:4530:void <clinit>():91:91 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():91:91 -> <clinit>
+    4466:4466:void <clinit>():91:91 -> <clinit>
+    4467:4467:void <clinit>():91:91 -> <clinit>
+    4468:4468:void <clinit>():91:91 -> <clinit>
+    4469:4469:void <clinit>():91:91 -> <clinit>
     1171:1171:void <clinit>():91:91 -> <clinit>
     1172:1172:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4532,"2":4533,"3":4534,"4":4535,"5":4536}}
-    4532:4532:void <clinit>():93:93 -> <clinit>
-    4533:4533:void <clinit>():93:93 -> <clinit>
-    4534:4534:void <clinit>():93:93 -> <clinit>
-    4535:4535:void <clinit>():93:93 -> <clinit>
-    4536:4536:void <clinit>():93:93 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():93:93 -> <clinit>
+    4466:4466:void <clinit>():93:93 -> <clinit>
+    4467:4467:void <clinit>():93:93 -> <clinit>
+    4468:4468:void <clinit>():93:93 -> <clinit>
+    4469:4469:void <clinit>():93:93 -> <clinit>
     1265:1265:void <clinit>():93:93 -> <clinit>
     1266:1266:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4537,"2":4538,"3":4539,"4":4540,"5":4541}}
-    4537:4537:void <clinit>():94:94 -> <clinit>
-    4538:4538:void <clinit>():94:94 -> <clinit>
-    4539:4539:void <clinit>():94:94 -> <clinit>
-    4540:4540:void <clinit>():94:94 -> <clinit>
-    4541:4541:void <clinit>():94:94 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():94:94 -> <clinit>
+    4466:4466:void <clinit>():94:94 -> <clinit>
+    4467:4467:void <clinit>():94:94 -> <clinit>
+    4468:4468:void <clinit>():94:94 -> <clinit>
+    4469:4469:void <clinit>():94:94 -> <clinit>
     1360:1360:void <clinit>():94:94 -> <clinit>
     1361:1361:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4542,"2":4543,"3":4544,"4":4545,"5":4546}}
-    4542:4542:void <clinit>():95:95 -> <clinit>
-    4543:4543:void <clinit>():95:95 -> <clinit>
-    4544:4544:void <clinit>():95:95 -> <clinit>
-    4545:4545:void <clinit>():95:95 -> <clinit>
-    4546:4546:void <clinit>():95:95 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():95:95 -> <clinit>
+    4466:4466:void <clinit>():95:95 -> <clinit>
+    4467:4467:void <clinit>():95:95 -> <clinit>
+    4468:4468:void <clinit>():95:95 -> <clinit>
+    4469:4469:void <clinit>():95:95 -> <clinit>
     1456:1456:void <clinit>():95:95 -> <clinit>
     1457:1457:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4547,"2":4548,"3":4549,"4":4550,"5":4551}}
-    4547:4547:void <clinit>():96:96 -> <clinit>
-    4548:4548:void <clinit>():96:96 -> <clinit>
-    4549:4549:void <clinit>():96:96 -> <clinit>
-    4550:4550:void <clinit>():96:96 -> <clinit>
-    4551:4551:void <clinit>():96:96 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():96:96 -> <clinit>
+    4466:4466:void <clinit>():96:96 -> <clinit>
+    4467:4467:void <clinit>():96:96 -> <clinit>
+    4468:4468:void <clinit>():96:96 -> <clinit>
+    4469:4469:void <clinit>():96:96 -> <clinit>
     1553:1553:void <clinit>():96:96 -> <clinit>
     1554:1554:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4553,"2":4554,"3":4555,"4":4556,"5":4557}}
-    4553:4553:void <clinit>():98:98 -> <clinit>
-    4554:4554:void <clinit>():98:98 -> <clinit>
-    4555:4555:void <clinit>():98:98 -> <clinit>
-    4556:4556:void <clinit>():98:98 -> <clinit>
-    4557:4557:void <clinit>():98:98 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():98:98 -> <clinit>
+    4466:4466:void <clinit>():98:98 -> <clinit>
+    4467:4467:void <clinit>():98:98 -> <clinit>
+    4468:4468:void <clinit>():98:98 -> <clinit>
+    4469:4469:void <clinit>():98:98 -> <clinit>
     1652:1652:void <clinit>():98:98 -> <clinit>
     1653:1653:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4558,"2":4559,"3":4560,"4":4561,"5":4562}}
-    4558:4558:void <clinit>():99:99 -> <clinit>
-    4559:4559:void <clinit>():99:99 -> <clinit>
-    4560:4560:void <clinit>():99:99 -> <clinit>
-    4561:4561:void <clinit>():99:99 -> <clinit>
-    4562:4562:void <clinit>():99:99 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():99:99 -> <clinit>
+    4466:4466:void <clinit>():99:99 -> <clinit>
+    4467:4467:void <clinit>():99:99 -> <clinit>
+    4468:4468:void <clinit>():99:99 -> <clinit>
+    4469:4469:void <clinit>():99:99 -> <clinit>
     1752:1752:void <clinit>():99:99 -> <clinit>
     1753:1753:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4563,"2":4564,"3":4565,"4":4566,"5":4567}}
-    4563:4563:void <clinit>():99:99 -> <clinit>
-    4564:4564:void <clinit>():99:99 -> <clinit>
-    4565:4565:void <clinit>():99:99 -> <clinit>
-    4566:4566:void <clinit>():99:99 -> <clinit>
-    4567:4567:void <clinit>():99:99 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():99:99 -> <clinit>
+    4466:4466:void <clinit>():99:99 -> <clinit>
+    4467:4467:void <clinit>():99:99 -> <clinit>
+    4468:4468:void <clinit>():99:99 -> <clinit>
+    4469:4469:void <clinit>():99:99 -> <clinit>
     1852:1852:void <clinit>():99:99 -> <clinit>
     1853:1853:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4568,"2":4569,"3":4570,"4":4571,"5":4572}}
-    4568:4568:void <clinit>():99:99 -> <clinit>
-    4569:4569:void <clinit>():99:99 -> <clinit>
-    4570:4570:void <clinit>():99:99 -> <clinit>
-    4571:4571:void <clinit>():99:99 -> <clinit>
-    4572:4572:void <clinit>():99:99 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():99:99 -> <clinit>
+    4466:4466:void <clinit>():99:99 -> <clinit>
+    4467:4467:void <clinit>():99:99 -> <clinit>
+    4468:4468:void <clinit>():99:99 -> <clinit>
+    4469:4469:void <clinit>():99:99 -> <clinit>
     1952:1952:void <clinit>():99:99 -> <clinit>
     1953:1953:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4573,"2":4574,"3":4575,"4":4576,"5":4577}}
-    4573:4573:void <clinit>():99:99 -> <clinit>
-    4574:4574:void <clinit>():99:99 -> <clinit>
-    4575:4575:void <clinit>():99:99 -> <clinit>
-    4576:4576:void <clinit>():99:99 -> <clinit>
-    4577:4577:void <clinit>():99:99 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():99:99 -> <clinit>
+    4466:4466:void <clinit>():99:99 -> <clinit>
+    4467:4467:void <clinit>():99:99 -> <clinit>
+    4468:4468:void <clinit>():99:99 -> <clinit>
+    4469:4469:void <clinit>():99:99 -> <clinit>
     2052:2052:void <clinit>():99:99 -> <clinit>
     2053:2053:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4578,"2":4579,"3":4580,"4":4581,"5":4582}}
-    4578:4578:void <clinit>():100:100 -> <clinit>
-    4579:4579:void <clinit>():100:100 -> <clinit>
-    4580:4580:void <clinit>():100:100 -> <clinit>
-    4581:4581:void <clinit>():100:100 -> <clinit>
-    4582:4582:void <clinit>():100:100 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():100:100 -> <clinit>
+    4466:4466:void <clinit>():100:100 -> <clinit>
+    4467:4467:void <clinit>():100:100 -> <clinit>
+    4468:4468:void <clinit>():100:100 -> <clinit>
+    4469:4469:void <clinit>():100:100 -> <clinit>
     2153:2153:void <clinit>():100:100 -> <clinit>
     2154:2154:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4583,"2":4584,"3":4585,"4":4586,"5":4587}}
-    4583:4583:void <clinit>():100:100 -> <clinit>
-    4584:4584:void <clinit>():100:100 -> <clinit>
-    4585:4585:void <clinit>():100:100 -> <clinit>
-    4586:4586:void <clinit>():100:100 -> <clinit>
-    4587:4587:void <clinit>():100:100 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():100:100 -> <clinit>
+    4466:4466:void <clinit>():100:100 -> <clinit>
+    4467:4467:void <clinit>():100:100 -> <clinit>
+    4468:4468:void <clinit>():100:100 -> <clinit>
+    4469:4469:void <clinit>():100:100 -> <clinit>
     2254:2254:void <clinit>():100:100 -> <clinit>
     2255:2255:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4588,"2":4589,"3":4590,"4":4591,"5":4592}}
-    4588:4588:void <clinit>():100:100 -> <clinit>
-    4589:4589:void <clinit>():100:100 -> <clinit>
-    4590:4590:void <clinit>():100:100 -> <clinit>
-    4591:4591:void <clinit>():100:100 -> <clinit>
-    4592:4592:void <clinit>():100:100 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():100:100 -> <clinit>
+    4466:4466:void <clinit>():100:100 -> <clinit>
+    4467:4467:void <clinit>():100:100 -> <clinit>
+    4468:4468:void <clinit>():100:100 -> <clinit>
+    4469:4469:void <clinit>():100:100 -> <clinit>
     2355:2355:void <clinit>():100:100 -> <clinit>
     2356:2356:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4593,"2":4594,"3":4595,"4":4596,"5":4597}}
-    4593:4593:void <clinit>():100:100 -> <clinit>
-    4594:4594:void <clinit>():100:100 -> <clinit>
-    4595:4595:void <clinit>():100:100 -> <clinit>
-    4596:4596:void <clinit>():100:100 -> <clinit>
-    4597:4597:void <clinit>():100:100 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():100:100 -> <clinit>
+    4466:4466:void <clinit>():100:100 -> <clinit>
+    4467:4467:void <clinit>():100:100 -> <clinit>
+    4468:4468:void <clinit>():100:100 -> <clinit>
+    4469:4469:void <clinit>():100:100 -> <clinit>
     2456:2456:void <clinit>():100:100 -> <clinit>
     2457:2457:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4599,"2":4600,"3":4601,"4":4602,"5":4603}}
-    4599:4599:void <clinit>():102:102 -> <clinit>
-    4600:4600:void <clinit>():102:102 -> <clinit>
-    4601:4601:void <clinit>():102:102 -> <clinit>
-    4602:4602:void <clinit>():102:102 -> <clinit>
-    4603:4603:void <clinit>():102:102 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():102:102 -> <clinit>
+    4466:4466:void <clinit>():102:102 -> <clinit>
+    4467:4467:void <clinit>():102:102 -> <clinit>
+    4468:4468:void <clinit>():102:102 -> <clinit>
+    4469:4469:void <clinit>():102:102 -> <clinit>
     2559:2559:void <clinit>():102:102 -> <clinit>
     2560:2560:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4604,"2":4605,"3":4606,"4":4607,"5":4608}}
-    4604:4604:void <clinit>():103:103 -> <clinit>
-    4605:4605:void <clinit>():103:103 -> <clinit>
-    4606:4606:void <clinit>():103:103 -> <clinit>
-    4607:4607:void <clinit>():103:103 -> <clinit>
-    4608:4608:void <clinit>():103:103 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():103:103 -> <clinit>
+    4466:4466:void <clinit>():103:103 -> <clinit>
+    4467:4467:void <clinit>():103:103 -> <clinit>
+    4468:4468:void <clinit>():103:103 -> <clinit>
+    4469:4469:void <clinit>():103:103 -> <clinit>
     2663:2663:void <clinit>():103:103 -> <clinit>
     2664:2664:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4610,"2":4611,"3":4612,"4":4613,"5":4614}}
-    4610:4610:void <clinit>():105:105 -> <clinit>
-    4611:4611:void <clinit>():105:105 -> <clinit>
-    4612:4612:void <clinit>():105:105 -> <clinit>
-    4613:4613:void <clinit>():105:105 -> <clinit>
-    4614:4614:void <clinit>():105:105 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():105:105 -> <clinit>
+    4466:4466:void <clinit>():105:105 -> <clinit>
+    4467:4467:void <clinit>():105:105 -> <clinit>
+    4468:4468:void <clinit>():105:105 -> <clinit>
+    4469:4469:void <clinit>():105:105 -> <clinit>
     2769:2769:void <clinit>():105:105 -> <clinit>
     2770:2770:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4615,"2":4616,"3":4617,"4":4618,"5":4619}}
-    4615:4615:void <clinit>():105:105 -> <clinit>
-    4616:4616:void <clinit>():105:105 -> <clinit>
-    4617:4617:void <clinit>():105:105 -> <clinit>
-    4618:4618:void <clinit>():105:105 -> <clinit>
-    4619:4619:void <clinit>():105:105 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():105:105 -> <clinit>
+    4466:4466:void <clinit>():105:105 -> <clinit>
+    4467:4467:void <clinit>():105:105 -> <clinit>
+    4468:4468:void <clinit>():105:105 -> <clinit>
+    4469:4469:void <clinit>():105:105 -> <clinit>
     2875:2875:void <clinit>():105:105 -> <clinit>
     2876:2876:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4620,"2":4621,"3":4622,"4":4623,"5":4624}}
-    4620:4620:void <clinit>():106:106 -> <clinit>
-    4621:4621:void <clinit>():106:106 -> <clinit>
-    4622:4622:void <clinit>():106:106 -> <clinit>
-    4623:4623:void <clinit>():106:106 -> <clinit>
-    4624:4624:void <clinit>():106:106 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():106:106 -> <clinit>
+    4466:4466:void <clinit>():106:106 -> <clinit>
+    4467:4467:void <clinit>():106:106 -> <clinit>
+    4468:4468:void <clinit>():106:106 -> <clinit>
+    4469:4469:void <clinit>():106:106 -> <clinit>
     2982:2982:void <clinit>():106:106 -> <clinit>
     2983:2983:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4625,"2":4626,"3":4627,"4":4628,"5":4629}}
-    4625:4625:void <clinit>():106:106 -> <clinit>
-    4626:4626:void <clinit>():106:106 -> <clinit>
-    4627:4627:void <clinit>():106:106 -> <clinit>
-    4628:4628:void <clinit>():106:106 -> <clinit>
-    4629:4629:void <clinit>():106:106 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():106:106 -> <clinit>
+    4466:4466:void <clinit>():106:106 -> <clinit>
+    4467:4467:void <clinit>():106:106 -> <clinit>
+    4468:4468:void <clinit>():106:106 -> <clinit>
+    4469:4469:void <clinit>():106:106 -> <clinit>
     3089:3089:void <clinit>():106:106 -> <clinit>
     3090:3090:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4630,"2":4631,"3":4632,"4":4633,"5":4634}}
-    4630:4630:void <clinit>():107:107 -> <clinit>
-    4631:4631:void <clinit>():107:107 -> <clinit>
-    4632:4632:void <clinit>():107:107 -> <clinit>
-    4633:4633:void <clinit>():107:107 -> <clinit>
-    4634:4634:void <clinit>():107:107 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():107:107 -> <clinit>
+    4466:4466:void <clinit>():107:107 -> <clinit>
+    4467:4467:void <clinit>():107:107 -> <clinit>
+    4468:4468:void <clinit>():107:107 -> <clinit>
+    4469:4469:void <clinit>():107:107 -> <clinit>
     3197:3197:void <clinit>():107:107 -> <clinit>
     3198:3198:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4635,"2":4636,"3":4637,"4":4638,"5":4639}}
-    4635:4635:void <clinit>():107:107 -> <clinit>
-    4636:4636:void <clinit>():107:107 -> <clinit>
-    4637:4637:void <clinit>():107:107 -> <clinit>
-    4638:4638:void <clinit>():107:107 -> <clinit>
-    4639:4639:void <clinit>():107:107 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():107:107 -> <clinit>
+    4466:4466:void <clinit>():107:107 -> <clinit>
+    4467:4467:void <clinit>():107:107 -> <clinit>
+    4468:4468:void <clinit>():107:107 -> <clinit>
+    4469:4469:void <clinit>():107:107 -> <clinit>
     3305:3305:void <clinit>():107:107 -> <clinit>
     3306:3306:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4640,"2":4641,"3":4642,"4":4643,"5":4644}}
-    4640:4640:void <clinit>():108:108 -> <clinit>
-    4641:4641:void <clinit>():108:108 -> <clinit>
-    4642:4642:void <clinit>():108:108 -> <clinit>
-    4643:4643:void <clinit>():108:108 -> <clinit>
-    4644:4644:void <clinit>():108:108 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():108:108 -> <clinit>
+    4466:4466:void <clinit>():108:108 -> <clinit>
+    4467:4467:void <clinit>():108:108 -> <clinit>
+    4468:4468:void <clinit>():108:108 -> <clinit>
+    4469:4469:void <clinit>():108:108 -> <clinit>
     3414:3414:void <clinit>():108:108 -> <clinit>
     3415:3415:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4645,"2":4646,"3":4647,"4":4648,"5":4649}}
-    4645:4645:void <clinit>():108:108 -> <clinit>
-    4646:4646:void <clinit>():108:108 -> <clinit>
-    4647:4647:void <clinit>():108:108 -> <clinit>
-    4648:4648:void <clinit>():108:108 -> <clinit>
-    4649:4649:void <clinit>():108:108 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():108:108 -> <clinit>
+    4466:4466:void <clinit>():108:108 -> <clinit>
+    4467:4467:void <clinit>():108:108 -> <clinit>
+    4468:4468:void <clinit>():108:108 -> <clinit>
+    4469:4469:void <clinit>():108:108 -> <clinit>
     3523:3523:void <clinit>():108:108 -> <clinit>
     3524:3524:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4650,"2":4651,"3":4652,"4":4653,"5":4654}}
-    4650:4650:void <clinit>():109:109 -> <clinit>
-    4651:4651:void <clinit>():109:109 -> <clinit>
-    4652:4652:void <clinit>():109:109 -> <clinit>
-    4653:4653:void <clinit>():109:109 -> <clinit>
-    4654:4654:void <clinit>():109:109 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():109:109 -> <clinit>
+    4466:4466:void <clinit>():109:109 -> <clinit>
+    4467:4467:void <clinit>():109:109 -> <clinit>
+    4468:4468:void <clinit>():109:109 -> <clinit>
+    4469:4469:void <clinit>():109:109 -> <clinit>
     3633:3633:void <clinit>():109:109 -> <clinit>
     3634:3634:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4655,"2":4656,"3":4657,"4":4658,"5":4659}}
-    4655:4655:void <clinit>():109:109 -> <clinit>
-    4656:4656:void <clinit>():109:109 -> <clinit>
-    4657:4657:void <clinit>():109:109 -> <clinit>
-    4658:4658:void <clinit>():109:109 -> <clinit>
-    4659:4659:void <clinit>():109:109 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():109:109 -> <clinit>
+    4466:4466:void <clinit>():109:109 -> <clinit>
+    4467:4467:void <clinit>():109:109 -> <clinit>
+    4468:4468:void <clinit>():109:109 -> <clinit>
+    4469:4469:void <clinit>():109:109 -> <clinit>
     3743:3743:void <clinit>():109:109 -> <clinit>
     3744:3744:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4660,"2":4661,"3":4662,"4":4663,"5":4664}}
-    4660:4660:void <clinit>():110:110 -> <clinit>
-    4661:4661:void <clinit>():110:110 -> <clinit>
-    4662:4662:void <clinit>():110:110 -> <clinit>
-    4663:4663:void <clinit>():110:110 -> <clinit>
-    4664:4664:void <clinit>():110:110 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():110:110 -> <clinit>
+    4466:4466:void <clinit>():110:110 -> <clinit>
+    4467:4467:void <clinit>():110:110 -> <clinit>
+    4468:4468:void <clinit>():110:110 -> <clinit>
+    4469:4469:void <clinit>():110:110 -> <clinit>
     3854:3854:void <clinit>():110:110 -> <clinit>
     3855:3855:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4665,"2":4666,"3":4667,"4":4668,"5":4669}}
-    4665:4665:void <clinit>():110:110 -> <clinit>
-    4666:4666:void <clinit>():110:110 -> <clinit>
-    4667:4667:void <clinit>():110:110 -> <clinit>
-    4668:4668:void <clinit>():110:110 -> <clinit>
-    4669:4669:void <clinit>():110:110 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():110:110 -> <clinit>
+    4466:4466:void <clinit>():110:110 -> <clinit>
+    4467:4467:void <clinit>():110:110 -> <clinit>
+    4468:4468:void <clinit>():110:110 -> <clinit>
+    4469:4469:void <clinit>():110:110 -> <clinit>
     3965:3965:void <clinit>():110:110 -> <clinit>
     3966:3966:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4671,"2":4672,"3":4673,"4":4674,"5":4675}}
-    4671:4671:void <clinit>():112:112 -> <clinit>
-    4672:4672:void <clinit>():112:112 -> <clinit>
-    4673:4673:void <clinit>():112:112 -> <clinit>
-    4674:4674:void <clinit>():112:112 -> <clinit>
-    4675:4675:void <clinit>():112:112 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():112:112 -> <clinit>
+    4466:4466:void <clinit>():112:112 -> <clinit>
+    4467:4467:void <clinit>():112:112 -> <clinit>
+    4468:4468:void <clinit>():112:112 -> <clinit>
+    4469:4469:void <clinit>():112:112 -> <clinit>
     4078:4078:void <clinit>():112:112 -> <clinit>
     4079:4079:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4676,"2":4677,"3":4678,"4":4679,"5":4680}}
-    4676:4676:void <clinit>():112:112 -> <clinit>
-    4677:4677:void <clinit>():112:112 -> <clinit>
-    4678:4678:void <clinit>():112:112 -> <clinit>
-    4679:4679:void <clinit>():112:112 -> <clinit>
-    4680:4680:void <clinit>():112:112 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():112:112 -> <clinit>
+    4466:4466:void <clinit>():112:112 -> <clinit>
+    4467:4467:void <clinit>():112:112 -> <clinit>
+    4468:4468:void <clinit>():112:112 -> <clinit>
+    4469:4469:void <clinit>():112:112 -> <clinit>
     4191:4191:void <clinit>():112:112 -> <clinit>
     4192:4192:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4681,"2":4682,"3":4683,"4":4684,"5":4685}}
-    4681:4681:void <clinit>():113:113 -> <clinit>
-    4682:4682:void <clinit>():113:113 -> <clinit>
-    4683:4683:void <clinit>():113:113 -> <clinit>
-    4684:4684:void <clinit>():113:113 -> <clinit>
-    4685:4685:void <clinit>():113:113 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():113:113 -> <clinit>
+    4466:4466:void <clinit>():113:113 -> <clinit>
+    4467:4467:void <clinit>():113:113 -> <clinit>
+    4468:4468:void <clinit>():113:113 -> <clinit>
+    4469:4469:void <clinit>():113:113 -> <clinit>
     4305:4305:void <clinit>():113:113 -> <clinit>
     4306:4306:void <clinit>():0:0 -> <clinit>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4686,"2":4687,"3":4688,"4":4689,"5":4690}}
-    4686:4686:void <clinit>():113:113 -> <clinit>
-    4687:4687:void <clinit>():113:113 -> <clinit>
-    4688:4688:void <clinit>():113:113 -> <clinit>
-    4689:4689:void <clinit>():113:113 -> <clinit>
-    4690:4690:void <clinit>():113:113 -> <clinit>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4465,"2":4466,"3":4467,"4":4468,"5":4469}}
+    4465:4465:void <clinit>():113:113 -> <clinit>
+    4466:4466:void <clinit>():113:113 -> <clinit>
+    4467:4467:void <clinit>():113:113 -> <clinit>
+    4468:4468:void <clinit>():113:113 -> <clinit>
+    4469:4469:void <clinit>():113:113 -> <clinit>
     4419:4419:void <clinit>():113:113 -> <clinit>
     4420:4463:void <clinit>():83:126 -> <clinit>
     4464:4464:void <clinit>():116:116 -> <clinit>
@@ -91033,7 +90654,7 @@
     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.JvmProtoBufUtil -> com.android.tools.r8.internal.Tw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.Mw:
 # {"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
@@ -91148,7 +90769,7 @@
     7:7:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     8:8: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
     8:8: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.Uw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.Nw:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
@@ -91194,7 +90815,7 @@
     740:740:void serializeTo(java.io.OutputStream):98 -> a
     741:741: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
     741:741:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.iu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.bu:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     java.util.HashMap interned -> b
     int firstIndex -> a
@@ -91203,13 +90824,13 @@
     21:24:java.lang.Integer find(java.lang.Object):19:22 -> a
     1:1:boolean isEmpty():16:16 -> b
     2:3:int intern(java.lang.Object):26:27 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.hu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.au:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     java.util.HashMap $receiver$inlined -> b
     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.kG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.dG:
 # {"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>
@@ -91248,7 +90869,7 @@
     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.YX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.OX:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> a
@@ -91350,7 +90971,7 @@
     9:9: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
     9:9: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
     9:9: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.e6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.d6:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> b
     boolean $assertionsDisabled -> c
     1:22:void <clinit>():60:81 -> <clinit>
@@ -91377,9 +90998,9 @@
     int peekCachedHashCode() -> e
     java.lang.String toString(java.lang.String) -> f
     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.c6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.b6:
     byte nextByte() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.d6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.c6:
     int bufferPos -> f
     byte[] EMPTY_BYTE_ARRAY -> g
     int flushedBuffersTotalBytes -> d
@@ -91408,7 +91029,7 @@
     20:28:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output.flushFullBuffer(int):898:906 -> write
     20:28:void write(byte[],int,int):814 -> write
     29:30:void write(byte[],int,int):815:816 -> write
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.Ib:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -91540,7 +91161,7 @@
     7:7:int readTag():158 -> n
     8:8:int readTag():158:158 -> n
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Lb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.Kb:
     byte[] buffer -> a
     java.io.OutputStream output -> d
     int limit -> b
@@ -91655,9 +91276,9 @@
     14:14:void writeSInt64(int,long):342 -> e
     1:4:void writeRawLittleEndian32(int):1246:1249 -> f
     1:4:void writeRawVarint32(int):1195:1198 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Kb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.Jb:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.nj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.ij:
     java.util.Map extensionsByNumber -> a
     int $r8$clinit -> b
     1:1:void <clinit>():159:159 -> <clinit>
@@ -91676,13 +91297,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     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.mj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.hj:
     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.dk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Yj:
     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
     int $r8$clinit -> e
@@ -92038,8 +91659,8 @@
     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.ck:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Ol:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Xj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Jl:
     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:738:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):0:737 -> a
@@ -92152,14 +91773,14 @@
     866:869:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,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):49 -> a
     870:870: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
     871:872: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.Il:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.Dl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     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.Jl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.El:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> c
     boolean extensionsIsMutable -> d
     1:3:void <init>():332:334 -> <init>
@@ -92207,7 +91828,7 @@
     36:36: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):433:433 -> a
     37:37: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 -> a
     37:37: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 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Ll:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Gl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     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>
@@ -92250,7 +91871,7 @@
     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.Kl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.Fl:
     java.util.Map$Entry next -> b
     java.util.Iterator iter -> a
     boolean messageSetWireFormat -> c
@@ -92294,7 +91915,7 @@
     16:16: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
     16:16:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
     17:22: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.Ml:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.Hl:
     boolean isRepeated -> e
     boolean isPacked -> f
     int number -> c
@@ -92305,7 +91926,7 @@
     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.Nl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.Il:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -92333,28 +91954,28 @@
     3:3: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
     3:3:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
     4:5: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.Xt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.Qt:
     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.Vt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.Ot:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.Wt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.Pt:
     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.qu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.ju:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> b
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException setUnfinishedMessage(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):57:57 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getUnfinishedMessage():66:66 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException truncatedMessage():70:70 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.VA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.OA:
     java.util.Iterator iterator -> b
     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.jC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.cC:
     int hash -> e
     byte[] bytes -> d
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -92392,7 +92013,7 @@
     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$LiteralByteIterator -> com.android.tools.r8.internal.iC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.bC:
     int position -> b
     int limit -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> d
@@ -92403,12 +92024,12 @@
     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.hE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.aE:
     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.BL:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.rL:
     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.MT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.CT:
     int treeDepth -> h
     int hash -> i
     int leftLength -> g
@@ -92485,7 +92106,7 @@
     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$Balancer -> com.android.tools.r8.internal.JT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.zT:
     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>
@@ -92516,7 +92137,7 @@
     691:691:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
     692:692:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
     689:689:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.KT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.AT:
     java.util.Stack breadCrumbs -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next -> c
     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>
@@ -92535,7 +92156,7 @@
     8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> j
     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.LT:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.BT:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator bytes -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> b
     int bytesRemaining -> d
@@ -92546,7 +92167,7 @@
     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.fV:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.VU:
     java.util.Map com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.overflowEntries -> d
     java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.entryList -> c
     boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.isImmutable -> e
@@ -92656,20 +92277,20 @@
     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.iV:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.YU:
     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.gV:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.WU:
     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.hV:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.XU:
     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.jV:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.ZU:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     java.lang.Comparable key -> b
     java.lang.Object value -> c
@@ -92697,7 +92318,7 @@
     1:1:int hashCode():452:452 -> hashCode
     1:3:java.lang.Object setValue(java.lang.Object):431:433 -> setValue
     1:1:java.lang.String toString():458:458 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.kV:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.aV:
     java.util.Iterator lazyOverflowIterator -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> e
     int pos -> b
@@ -92720,7 +92341,7 @@
     9:12:void remove():566 -> remove
     13:13:void remove():566:566 -> remove
     14:14:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.lV:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.bV:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> b
     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>
@@ -92732,9 +92353,9 @@
     1:1:java.util.Iterator iterator():474:474 -> iterator
     1:3:boolean remove(java.lang.Object):514:516 -> remove
     1:1:int size():479:479 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.w00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.m00:
     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.c10:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.S00:
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
     67:67:int partialIsValidUtf8(byte[],int,int):252:252 -> a
     68:79:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):270:281 -> a
@@ -92755,9 +92376,9 @@
     94:94:int partialIsValidUtf8(byte[],int,int):256 -> a
     95:95:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):306:306 -> a
     95:95:int partialIsValidUtf8(byte[],int,int):256 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.z20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.p20:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.x20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.n20:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType javaType -> b
     int wireType -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType FLOAT -> e
@@ -92786,18 +92407,18 @@
     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.t20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.j20:
     1:117:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):0:116 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.u20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.k20:
     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.v20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.l20:
     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.w20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.m20:
     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.y20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.o20:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType[] $VALUES -> l
@@ -92812,7 +92433,7 @@
     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.Xv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.Qv:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():85:85 -> <clinit>
@@ -92826,7 +92447,7 @@
     1:1:void visitEnd():75 -> b
     2:2:void visitEnd():75:75 -> 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.aw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.Tv:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():280:280 -> <clinit>
@@ -92834,14 +92455,14 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):256:256 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():260:260 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.bw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.Uv:
 # {"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.dw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.Wv:
 # {"id":"sourceFile","fileName":"jvmExtensions.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):25:25 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):167 -> a
@@ -92852,7 +92473,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):31:31 -> b
     1:1:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):182 -> b
     2:2:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):182:182 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.ew:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.Xv:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -92869,7 +92490,7 @@
     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.gw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.Zv:
 # {"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
@@ -92880,14 +92501,14 @@
     2:2:void visitLambdaClassOriginName(java.lang.String):144:144 -> a
     3:3:void visitEnd():151:151 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():126:126 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.jw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.cw:
 # {"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.ww:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.pw:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -92904,7 +92525,7 @@
     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.zw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.sw:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():115:115 -> <clinit>
@@ -92916,7 +92537,7 @@
     1:1:void visitEnd():105 -> b
     2:2:void visitEnd():105:105 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():99:99 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.Bw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.uw:
 # {"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
@@ -92929,7 +92550,7 @@
     1:1:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):232:232 -> b
     2:2:void visitEnd():239:239 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():172:172 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.Ww:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.Pw:
 # {"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
@@ -92940,7 +92561,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):344:344 -> a
     2:2:void visitEnd():351:351 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():327:327 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Yw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Rw:
 # {"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
@@ -92950,7 +92571,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):299:299 -> a
     2:2:void visitEnd():306:306 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():291:291 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.iz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.bz:
 # {"id":"sourceFile","fileName":"KotlinClassHeader.kt"}
     java.lang.String packageName -> g
     java.lang.String extraString -> f
@@ -93036,7 +92657,7 @@
     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.lz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.ez:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():310:310 -> <init>
     1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.checkMetadataVersion(int[]):345:345 -> a
@@ -93230,10 +92851,10 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> b
     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.mz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.fz:
 # {"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.Wv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.Pv:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     int jvmFlags -> f
@@ -93255,7 +92876,7 @@
     1:1:int getJvmFlags():38:38 -> d
     1:1:java.util.List getLocalDelegatedProperties():35:35 -> e
     1:1:java.lang.String getModuleName():36:36 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.Zv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.Sv:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():145:145 -> <init>
@@ -93265,10 +92886,10 @@
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():146:146 -> a
     6:6:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):149:149 -> a
     1:1:void setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):146:146 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.cw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.Vv:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     1:1: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.fw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.Yv:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
@@ -93280,7 +92901,7 @@
     8:8:void visitLambdaClassOriginName(java.lang.String):97:97 -> a
     1:1:java.lang.String getLambdaClassOriginName():90:90 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():89:89 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.uw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.nw:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():17:17 -> <init>
     void readTypeAliasExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext) -> a
@@ -93335,7 +92956,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():311:311 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():309:309 -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension createValueParameterExtension() -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.mw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.fw:
 # {"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
@@ -93344,7 +92965,7 @@
     2:3:void visitModuleName(java.lang.String):134:135 -> a
     4:4:void visitJvmFlags(int):141:141 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):124:124 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.lw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.ew:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> b
     1:1:java.lang.Object invoke(java.lang.Object):129:129 -> a
@@ -93363,14 +92984,14 @@
     138:138:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363:17363 -> a
     138:138: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):130 -> a
     138:138:java.lang.Object invoke(java.lang.Object):129 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.nw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.gw:
 # {"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):249:249 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):252:252 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.ow:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.hw:
 # {"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
@@ -93378,14 +92999,14 @@
     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):177:177 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):180:180 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):185:185 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.qw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.jw:
 # {"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):151:151 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):154:154 -> a
     2:3:void visitModuleName(java.lang.String):159:160 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.pw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.iw:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> b
     1:1:java.lang.Object invoke(java.lang.Object):154:154 -> a
@@ -93404,7 +93025,7 @@
     163:163:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363:17363 -> a
     163:163: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):155 -> a
     163:163:java.lang.Object invoke(java.lang.Object):154 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.rw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.kw:
 # {"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 signatureOrNull -> d
@@ -93434,7 +93055,7 @@
     11:11: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():3515:3515 -> b
     11:11:void visitEnd():239 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder getSignature():199:199 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.sw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.lw:
 # {"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
@@ -93449,7 +93070,7 @@
     6:6:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279 -> a
     7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     7:7:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.mw:
 # {"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
@@ -93463,7 +93084,7 @@
     5:5:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):264 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     6:6:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):264 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.yw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.rw:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
@@ -93479,7 +93100,7 @@
     123:123:void visitModuleName(java.lang.String):75:75 -> a
     1:1:java.util.List getLocalDelegatedProperties():68:68 -> c
     1:1:java.lang.String getModuleName():69:69 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.Aw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.tw:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForDelegate -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
@@ -93500,7 +93121,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():112:112 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():113:113 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForDelegate():114:114 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.Vw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.Ow:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> d
     boolean isRaw -> c
@@ -93516,7 +93137,7 @@
     14:14:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):181:181 -> a
     1:1:java.util.List getAnnotations():174:174 -> b
     1:1:boolean isRaw():173:173 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.Xw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.Qw:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> c
     1:2:void <init>():158:159 -> <init>
@@ -93529,7 +93150,7 @@
     31:31:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):158 -> a
     32:32:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):162:162 -> a
     1:1:java.util.List getAnnotations():159:159 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.Zw:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.Sw:
 # {"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:66: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:62 -> a
@@ -93538,31 +93159,31 @@
     67:67: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
     68:75: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:24 -> a
     76:85: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:24 -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Ey:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.xy:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Fy:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Gy:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Hy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.yy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.zy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Ay:
     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.Iy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.By:
     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.Jy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Cy:
     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.Ky:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Ly:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.Dy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Ey:
     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.My:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.Fy:
     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.Ny:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.Gy:
     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.Oy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.Hy:
     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.Py:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.Qy:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.Ry:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.Iy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.Jy:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.Ky:
     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.Sy:
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.az:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.Ly:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.Ty:
     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
@@ -93570,12 +93191,12 @@
     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):93:99 -> <init>
-com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.internal.Vy:
+com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.internal.Oy:
     java.util.Set kotlinPrimitivesDescriptors -> a
     java.util.Set kotlinStaticallyKnownTypes -> b
     1:32:void <clinit>():58:89 -> <clinit>
     1:2:void lambda$static$0(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,java.lang.String):81:82 -> a
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.Wy:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.Py:
     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):102:102 -> <init>
@@ -93585,7 +93206,7 @@
     13:26:void <init>(com.android.tools.r8.kotlin.Kotlin):117:130 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):128:128 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):120:120 -> a
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.Xy:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.Qy:
     com.android.tools.r8.graph.DexMethod checkNotNullParameter -> d
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> c
     com.android.tools.r8.graph.DexMethod throwParameterIsNullNPE -> b
@@ -93597,7 +93218,7 @@
     25:31:void <init>(com.android.tools.r8.kotlin.Kotlin):177:183 -> <init>
     32:37:void <init>(com.android.tools.r8.kotlin.Kotlin):181:186 -> <init>
     38:38:void <init>(com.android.tools.r8.kotlin.Kotlin):185:185 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.Yy:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.Ry:
     com.android.tools.r8.graph.DexString kind -> a
     com.android.tools.r8.graph.DexString metadataVersion -> b
     com.android.tools.r8.graph.DexString bytecodeVersion -> c
@@ -93607,11 +93228,11 @@
     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):144:152 -> <init>
-com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.Zy:
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.Sy:
     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):155:159 -> <init>
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.gz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.Zy:
     java.util.Map EMPTY_ARGUMENTS -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -93622,7 +93243,7 @@
     11:20: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 -> a
     21:21: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
     22:26:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):51:55 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.bz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.Uy:
     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
@@ -93630,7 +93251,7 @@
     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.cz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.Vy:
     java.util.List value -> b
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> c
     1:2:void <clinit>():160:161 -> <clinit>
@@ -93640,7 +93261,7 @@
     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.dz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.Wy:
     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>
@@ -93649,7 +93270,7 @@
     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.ez:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.Xy:
     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>
@@ -93660,14 +93281,14 @@
     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.fz:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.Yy:
     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.hz:
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.az:
     java.util.Map arguments -> b
     java.util.List EMPTY_ANNOTATIONS -> c
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> a
@@ -93683,7 +93304,7 @@
     65:65:void lambda$rewrite$0(java.util.Map,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):74:74 -> a
     66:67:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89:90 -> a
     68:68: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.jz:
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.cz:
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> l
     com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> t
     com.android.tools.r8.kotlin.KotlinTypeInfo inlineClassUnderlyingType -> r
@@ -93823,14 +93444,14 @@
     1:1:java.util.function.Consumer lambda$trace$6(com.android.tools.r8.kotlin.KotlinTypeReference):420:420 -> b
     1:1:java.lang.String getPackageName():405:405 -> l
     1:1:int[] getMetadataVersion():410:410 -> m
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.kz:
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.dz:
     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
     boolean isSyntheticClass() -> j
     java.lang.String getPackageName() -> l
     int[] getMetadataVersion() -> m
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.oz:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.hz:
     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
@@ -93940,14 +93561,14 @@
     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$MetadataError -> com.android.tools.r8.internal.nz:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.gz:
     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.uz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.nz:
     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
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.pz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.iz:
     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>
@@ -93967,38 +93588,38 @@
     7:7:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):73:73 -> a
     11:11:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
     12:12: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.qz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.jz:
     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.rz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.kz:
     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.sz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.lz:
     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.tz:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.mz:
     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.vz:
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.oz:
     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.wz:
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.pz:
     java.util.List valueParameters -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
@@ -94018,7 +93639,7 @@
     31:33:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):94:96 -> a
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> g
     boolean isConstructor() -> k
-com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.xz:
+com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.qz:
     java.util.List effects -> a
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -94030,7 +93651,7 @@
     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.zz:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.sz:
     java.util.List functionsWithNoBacking -> b
     java.util.List typeAliases -> a
     java.util.List propertiesWithNoBacking -> c
@@ -94079,7 +93700,7 @@
     171:171:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):255:255 -> a
     1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):222:222 -> b
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):256:256 -> c
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.yz:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.rz:
     com.android.tools.r8.graph.DexEncodedField backingField -> a
     com.android.tools.r8.graph.DexEncodedMethod getter -> c
     com.android.tools.r8.graph.DexEncodedMethod setter -> b
@@ -94092,7 +93713,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):259:259 -> b
     2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):276:277 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):259:259 -> c
-com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.Az:
+com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.tz:
     java.util.List orArguments -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo isInstanceType -> d
     java.util.List andArguments -> e
@@ -94109,7 +93730,7 @@
     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.Bz:
+com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.uz:
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
     java.util.List constructorArguments -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> b
@@ -94118,8 +93739,8 @@
     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.Cz:
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.Dz:
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.vz:
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.wz:
     int[] metadataVersion -> c
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
     java.lang.String packageName -> b
@@ -94130,7 +93751,7 @@
     14:14:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:82 -> a
     1:1:java.lang.String getPackageName():72:72 -> l
     1:1:int[] getMetadataVersion():77:77 -> m
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.Ez:
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.xz:
     com.android.tools.r8.kotlin.KotlinTypeInfo kotlinTypeInfo -> b
     java.lang.String typeFlexibilityId -> a
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> c
@@ -94141,7 +93762,7 @@
     6:14:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):45:53 -> a
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):54:54 -> a
     16:23:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):59:66 -> a
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.Fz:
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.yz:
     com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
@@ -94182,7 +93803,7 @@
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isFunction() -> h
     1:1:boolean hasCrossInlineParameter():72:72 -> n
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.Gz:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.zz:
     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>
@@ -94192,7 +93813,7 @@
     5:5:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):38:38 -> a
     6:19: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
     20:20:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):66:66 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Hz:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Az:
     java.util.List EMPTY_PARAMETERS_LIST -> e
     java.util.List parameters -> c
     boolean $assertionsDisabled -> f
@@ -94228,7 +93849,7 @@
     128:128:java.lang.String toString():112:112 -> toString
     129:129:java.lang.String toString():112:112 -> toString
     117:126:java.lang.String toString():114:123 -> toString
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.android.tools.r8.internal.Jz:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.android.tools.r8.internal.Cz:
     java.util.Set noExtensionIndicesForFunctions -> a
     java.util.Set noExtensionIndicesForConstructors -> b
     com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation EMPTY -> c
@@ -94299,7 +93920,7 @@
     65:65:com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation readInformationFromMessage(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.utils.InternalOptions):91 -> a
     66:66:boolean hasJvmMethodSignatureExtensionForConstructor(int):121:121 -> a
     1:1:boolean hasJvmMethodSignatureExtensionForFunction(int):117:117 -> b
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder -> com.android.tools.r8.internal.Iz:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder -> com.android.tools.r8.internal.Bz:
     java.util.Set noExtensionIndicesForFunctions -> a
     java.util.Set noExtensionIndicesForConstructors -> b
     1:4:void <init>():132:135 -> <init>
@@ -94314,7 +93935,7 @@
     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.Kz:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.Dz:
     boolean hasBacking -> b
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> a
     boolean $assertionsDisabled -> c
@@ -94332,7 +93953,7 @@
     16:23:com.android.tools.r8.kotlin.KotlinLambdaInfo create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):50:57 -> a
     24:35: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):65:76 -> a
     36:36:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):81:81 -> a
-com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.Lz:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.Ez:
     java.util.List propertyInfos -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> b
     boolean $assertionsDisabled -> c
@@ -94343,7 +93964,7 @@
     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.Mz:
+com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.Fz:
     boolean isNoKotlinInformation() -> a
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isProperty() -> c
@@ -94353,7 +93974,7 @@
     boolean isFunction() -> h
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> i
     boolean isConstructor() -> k
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Nz:
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Gz:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     java.lang.String message -> d
@@ -94361,7 +93982,7 @@
     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.Pz:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.Iz:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> c
@@ -94414,7 +94035,7 @@
     139:139:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):137 -> a
     140:140:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):137:137 -> a
     1:2:boolean lambda$done$4(com.android.tools.r8.graph.DexAnnotation):121:122 -> b
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Oz:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Hz:
     java.util.Set prunedTypes -> c
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> b
     com.android.tools.r8.graph.ProgramDefinition context -> a
@@ -94424,7 +94045,7 @@
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():174:174 -> a
     1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):158:158 -> d
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):166:169 -> e
-com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.internal.Qz:
+com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.internal.Jz:
     java.util.Set references -> b
     boolean $assertionsDisabled -> c
     int count -> a
@@ -94439,7 +94060,7 @@
     26:26:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
     26:26:boolean com.android.tools.r8.kotlin.KotlinMetadataMembersTracker.isKotlinJvmType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):63 -> a
     26:26: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.Sz:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.Lz:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens lens -> b
@@ -94549,7 +94170,7 @@
     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$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Rz:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Kz:
     boolean writeData2 -> e
     boolean writeExtraString -> f
     boolean writePackageName -> g
@@ -94562,7 +94183,7 @@
     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.Xz:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.Qz:
     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>():36:37 -> <clinit>
@@ -94582,7 +94203,7 @@
     118:118:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):199 -> a
     119:129:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):202:212 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getNoKotlinInfo():81:81 -> b
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.Vz:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.Oz:
     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
@@ -94597,17 +94218,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():150:150 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):112:112 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():154:154 -> c
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.Nz:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):120:120 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):123:126 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.Tz:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.Mz:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():126:126 -> <clinit>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):126:126 -> <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):133:138 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.Wz:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.Pz:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):39:39 -> <init>
     2:3:void <init>(java.lang.String):44:45 -> <init>
@@ -94617,7 +94238,7 @@
     1:1:java.lang.String getPackageName():61:61 -> l
     1:1:int[] getMetadataVersion():66:66 -> m
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.Yz:
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.Rz:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:122:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:121 -> a
@@ -94697,164 +94318,175 @@
     926:929:void appendKeyValue(java.lang.String,java.lang.String,java.lang.StringBuilder,java.lang.String):210 -> a
     933:933:void lambda$appendKeyValue$8(java.lang.StringBuilder,java.lang.String):210:210 -> a
     934:986:void appendKmDeclarationContainer(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer):215:267 -> a
-    987:987:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):230:230 -> a
-    988:988:void lambda$appendKmDeclarationContainer$15(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):280:280 -> a
-    989:989:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):286:286 -> a
-    990:990:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
-    990:990:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
-    991:991: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
-    991:991:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69 -> a
-    991:991:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
-    992:992:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69:69 -> a
-    992:992:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
-    993:994:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287:288 -> a
-    995:996:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):305:306 -> a
-    997:997:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    997:997:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):48 -> a
-    997:997:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306 -> a
-    998:998:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):48:48 -> a
-    998:998:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306 -> a
-    999:1027:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306:334 -> a
-    1028:1043:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):330:345 -> a
-    1044:1044:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1451,"2":1452,"3":1453}}
-    1451:1451:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
-    1452:1452:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
-    1453:1453:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
-    1391:1391:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):347:347 -> a
-    1392:1395:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:349 -> a
-    1396:1402:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):348:354 -> a
-    1403:1409:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):350:356 -> a
-    1410:1410:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):355:355 -> a
-    1411:1411:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    1411:1411:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):39 -> a
-    1411:1411:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):361 -> a
-    1412:1412:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):39:39 -> a
-    1412:1412:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):361 -> a
-    1413:1413:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):357:357 -> a
-    1414:1414:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    1414:1414:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):29 -> a
-    1414:1414:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362 -> a
-    1415:1415:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):29:29 -> a
-    1415:1415:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362 -> a
-    1416:1450:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362:396 -> a
-    1454:1454:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):313:313 -> a
-    1455:1455:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):326:326 -> a
-    1456:1456:void lambda$appendKmClass$23(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):374:374 -> a
-    1457:1457:java.lang.String lambda$appendKmClass$25(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):390:390 -> a
-    1458:1458:void lambda$appendKmClass$26(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):393:393 -> a
-    1459:1459:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):401:401 -> a
-    1460:1460:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):421:421 -> a
-    1461:1461:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):473:473 -> a
-    1462:1465:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):543:546 -> a
-    1466:1466:void lambda$appendKmType$41(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):564:564 -> a
-    1467:1467:void lambda$appendKmType$43(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):571:571 -> a
-    1468:1468:void lambda$appendKmType$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):584:584 -> a
-    1469:1469:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):600:600 -> a
-    1470:1470:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):599:599 -> a
-    1471:1471:void lambda$appendKmType$48(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):616:616 -> a
-    1472:1472:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):624:624 -> a
-    1473:1473:void lambda$appendValueParameters$53(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):650:650 -> a
-    1474:1477:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):657:660 -> a
-    1478:1478:void appendTypeParameters(java.lang.String,java.lang.StringBuilder,java.util.List):686:686 -> a
-    1479:1479:void lambda$appendTypeParameters$57(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):692:692 -> a
-    1480:1480:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):698:698 -> a
-    1481:1481:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):739:739 -> a
-    1482:1482:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):787:787 -> a
-    1483:1484:void lambda$appendKmAnnotation$73(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.String):792:793 -> a
-    1485:1485:void lambda$appendKmAnnotation$71(java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):805:805 -> a
-    1486:1486:void lambda$appendKmAnnotation$70(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String):810:810 -> a
-    1487:1487:void lambda$appendKmAnnotation$69(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):815:815 -> a
-    1488:1499:void appendKmArgument(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):825:836 -> a
-    1500:1500:void appendKmVersionRequirement(java.lang.String,java.lang.StringBuilder,java.util.List):842:842 -> a
-    1501:1501:void lambda$appendKmVersionRequirement$76(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):853:853 -> a
-    1502:1504:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):858:860 -> a
-    1505:1513:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):859:867 -> a
-    1514:1522:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):861:869 -> a
-    1523:1523:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):868:868 -> a
-    1524:1524:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():801:801 -> a
-    1524:1524:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874 -> a
-    1525:1525:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874:874 -> a
-    1526:1526:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):870:870 -> a
-    1527:1527:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():801:801 -> a
-    1527:1527:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874 -> a
-    1528:1528:void appendKmContract(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract):881:881 -> a
-    1529:1529:void lambda$appendKmContract$78(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):896:896 -> a
-    1530:1530:void appendKmEffect(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):901:901 -> a
-    1531:1531:void lambda$appendKmEffect$81(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):923:923 -> a
-    1532:1532:void appendKmEffectExpression(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):941:941 -> a
-    1:1:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
-    2:2:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":177,"2":178,"3":179}}
+    987:989:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):224:226 -> a
+    990:993:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):225:228 -> a
+    994:994:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):220:220 -> a
+    995:995:void lambda$appendKmDeclarationContainer$10(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):230:230 -> a
+    996:996:void lambda$appendKmDeclarationContainer$15(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):280:280 -> a
+    997:997:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):286:286 -> a
+    998:998:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
+    998:998:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
+    999:999: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
+    999:999:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69 -> a
+    999:999:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
+    1000:1000:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69:69 -> a
+    1000:1000:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287 -> a
+    1001:1002:void appendKmPackage(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):287:288 -> a
+    1003:1004:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):305:306 -> a
+    1005:1005:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
+    1005:1005:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):48 -> a
+    1005:1005:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306 -> a
+    1006:1006:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):48:48 -> a
+    1006:1006:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306 -> a
+    1007:1035:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):306:334 -> a
+    1036:1051:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):330:345 -> a
+    1052:1052:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1459,"2":1460,"3":1461}}
+    1459:1459:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
+    1460:1460:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
+    1461:1461:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:346 -> a
+    1399:1399:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):347:347 -> a
+    1400:1403:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):346:349 -> a
+    1404:1410:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):348:354 -> a
+    1411:1417:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):350:356 -> a
+    1418:1418:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):355:355 -> a
+    1419:1419:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
+    1419:1419:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):39 -> a
+    1419:1419:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):361 -> a
+    1420:1420:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnonymousObjectOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):39:39 -> a
+    1420:1420:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):361 -> a
+    1421:1421:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):357:357 -> a
+    1422:1422:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
+    1422:1422:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):29 -> a
+    1422:1422:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362 -> a
+    1423:1423:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):29:29 -> a
+    1423:1423:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362 -> a
+    1424:1458:void appendKmClass(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):362:396 -> a
+    1462:1462:void lambda$appendKmClass$19(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):313:313 -> a
+    1463:1463:void lambda$appendKmClass$20(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):326:326 -> a
+    1464:1464:void lambda$appendKmClass$23(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):374:374 -> a
+    1465:1465:java.lang.String lambda$appendKmClass$25(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):390:390 -> a
+    1466:1466:void lambda$appendKmClass$26(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):393:393 -> a
+    1467:1467:void appendKmConstructor(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):401:401 -> a
+    1468:1468:void lambda$appendKmConstructor$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):412:412 -> a
+    1469:1469:void appendKmFunction(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):421:421 -> a
+    1470:1470:void lambda$appendKmFunction$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):432:432 -> a
+    1471:1471:void appendKmProperty(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):473:473 -> a
+    1472:1472:void lambda$appendKmProperty$36(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):484:484 -> a
+    1473:1476:void appendKmType(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):543:546 -> a
+    1477:1477:void lambda$appendKmType$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):562:562 -> a
+    1478:1478:void lambda$appendKmType$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):558:558 -> a
+    1479:1479:void lambda$appendKmType$41(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):564:564 -> a
+    1480:1480:void lambda$appendKmType$43(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):571:571 -> a
+    1481:1481:void lambda$appendKmType$47(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):584:584 -> a
+    1482:1482:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):600:600 -> a
+    1483:1483:void lambda$appendKmType$45(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):599:599 -> a
+    1484:1484:void lambda$appendKmType$48(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):616:616 -> a
+    1485:1485:void appendKmTypeProjection(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection):624:624 -> a
+    1486:1486:void lambda$appendKmTypeProjection$51(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):634:634 -> a
+    1487:1487:void lambda$appendValueParameters$53(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):650:650 -> a
+    1488:1491:void appendValueParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter):657:660 -> a
+    1492:1492:void lambda$appendValueParameter$54(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):672:672 -> a
+    1493:1493:void appendTypeParameters(java.lang.String,java.lang.StringBuilder,java.util.List):686:686 -> a
+    1494:1494:void lambda$appendTypeParameters$57(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):692:692 -> a
+    1495:1495:void appendTypeParameter(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):698:698 -> a
+    1496:1496:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):716:716 -> a
+    1497:1497:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):712:712 -> a
+    1498:1498:void appendTypeAlias(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias):739:739 -> a
+    1499:1499:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):753:753 -> a
+    1500:1500:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):749:749 -> a
+    1501:1501:void appendKmAnnotation(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):787:787 -> a
+    1502:1503:void lambda$appendKmAnnotation$73(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.String):792:793 -> a
+    1504:1509:void lambda$appendKmAnnotation$72(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):798:803 -> a
+    1510:1510:void lambda$appendKmAnnotation$72(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):799:799 -> a
+    1511:1511:void lambda$appendKmAnnotation$71(java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):805:805 -> a
+    1512:1512:void lambda$appendKmAnnotation$70(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String):810:810 -> a
+    1513:1513:void lambda$appendKmAnnotation$69(java.lang.String,java.lang.StringBuilder,java.util.Map,java.lang.String,java.lang.String):815:815 -> a
+    1514:1525:void appendKmArgument(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):825:836 -> a
+    1526:1526:void lambda$appendKmArgument$74(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):833:833 -> a
+    1527:1527:void appendKmVersionRequirement(java.lang.String,java.lang.StringBuilder,java.util.List):842:842 -> a
+    1528:1528:void lambda$appendKmVersionRequirement$77(java.lang.StringBuilder,java.util.List,java.lang.String):847:847 -> a
+    1529:1529:void lambda$appendKmVersionRequirement$76(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):853:853 -> a
+    1530:1532:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):858:860 -> a
+    1533:1541:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):859:867 -> a
+    1542:1550:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):861:869 -> a
+    1551:1551:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):868:868 -> a
+    1552:1552:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():801:801 -> a
+    1552:1552:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874 -> a
+    1553:1553:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874:874 -> a
+    1554:1554:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):870:870 -> a
+    1555:1555:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement.getVersion():801:801 -> a
+    1555:1555:void lambda$appendKmVersionRequirement$75(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement,java.lang.String):874 -> a
+    1556:1556:void appendKmContract(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract):881:881 -> a
+    1557:1557:void lambda$appendKmContract$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):895:895 -> a
+    1558:1558:void lambda$appendKmContract$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):891:891 -> a
+    1559:1559:void lambda$appendKmContract$78(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):896:896 -> a
+    1560:1560:void appendKmEffect(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect):901:901 -> a
+    1561:1561:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):921:921 -> a
+    1562:1562:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):917:917 -> a
+    1563:1563:void lambda$appendKmEffect$81(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):923:923 -> a
+    1564:1564:void lambda$appendKmEffect$83(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):934:934 -> a
+    1565:1565:void appendKmEffectExpression(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):941:941 -> a
+    1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:0 -> b
+    1:1:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):28:28 -> b
+    2:2:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):176 -> b
+    2:2:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730 -> b
+    3:3:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):176:176 -> b
+    3:3:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730 -> b
+    4:4:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730:730 -> b
+    5:5:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):726:726 -> b
+    6:6:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
+    7:7:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":182,"2":183,"3":184}}
+    182:182:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
+    183:183:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
+    184:184:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
     177:177:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
-    178:178:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
-    179:179:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
-    172:172:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170:170 -> b
-    173:176:void com.android.tools.r8.kotlin.KotlinMetadataWriter.appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):162:165 -> b
-    173:176:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170 -> b
-    180:180:void lambda$appendKmSection$5(java.util.function.Consumer,java.lang.String):173:173 -> b
-    181:183:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):224:226 -> b
-    184:187:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):225:228 -> b
-    188:188:void lambda$appendKmDeclarationContainer$11(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):220:220 -> b
-    189:189:void lambda$appendKmDeclarationContainer$13(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):264:264 -> b
-    190:190:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):324:324 -> b
-    191:191:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):320:320 -> b
-    192:192:void lambda$appendKmConstructor$28(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):412:412 -> b
-    193:193:void lambda$appendKmFunction$30(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):432:432 -> b
-    194:194:void lambda$appendKmProperty$36(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):484:484 -> b
-    195:195:void lambda$appendKmType$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):562:562 -> b
-    196:196:void lambda$appendKmType$42(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):558:558 -> b
-    197:197:void lambda$appendKmType$44(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):576:576 -> b
-    198:198:void lambda$appendKmType$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):593:593 -> b
-    199:204:void lambda$appendKmType$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):589:594 -> b
-    205:205:void lambda$appendKmTypeProjection$51(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):634:634 -> b
-    206:206:void appendValueParameters(java.lang.String,java.lang.StringBuilder,java.util.List):644:644 -> b
-    207:207:void lambda$appendValueParameter$54(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):672:672 -> b
-    208:208:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):716:716 -> b
-    209:209:void lambda$appendTypeParameter$59(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):712:712 -> b
-    210:210:void lambda$appendTypeParameter$58(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):718:718 -> b
-    211:211:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):753:753 -> b
-    212:212:void lambda$appendTypeAlias$64(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):749:749 -> b
-    213:213:void lambda$appendTypeAlias$63(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):755:755 -> b
-    214:219:void lambda$appendKmAnnotation$72(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):798:803 -> b
-    220:220:void lambda$appendKmAnnotation$72(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation,java.lang.StringBuilder,java.lang.String):799:799 -> b
-    221:221:void lambda$appendKmArgument$74(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):833:833 -> b
-    222:222:void lambda$appendKmContract$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):895:895 -> b
-    223:223:void lambda$appendKmContract$79(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):891:891 -> b
-    224:224:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):921:921 -> b
-    225:225:void lambda$appendKmEffect$82(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):917:917 -> b
-    226:226:void lambda$appendKmEffect$83(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):934:934 -> b
-    227:227:void lambda$appendKmEffectExpression$86(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):979:979 -> b
-    1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):0:0 -> c
-    1:1:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):28:28 -> c
-    2:2:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):176 -> c
-    2:2:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730 -> c
-    3:3:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter):176:176 -> c
-    3:3:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730 -> c
-    4:4:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):730:730 -> c
-    5:5:void lambda$appendTypeParameter$61(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):726:726 -> c
-    6:8:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):242:244 -> c
-    9:28:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):243:262 -> c
-    29:29:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):238:238 -> c
-    30:30:void lambda$appendKmPackage$17(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):299:299 -> c
-    31:31:void lambda$appendKmClass$22(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):342:342 -> c
-    32:41:void lambda$appendKmConstructor$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):406:415 -> c
-    42:44:void lambda$appendKmConstructor$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):414:416 -> c
-    45:45:void lambda$appendKmFunction$31(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):437:437 -> c
-    46:46:void lambda$appendKmProperty$37(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):489:489 -> c
-    47:47:void lambda$appendKmType$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):614:614 -> c
-    48:48:void lambda$appendKmType$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):610:610 -> c
-    49:57:void lambda$appendKmTypeProjection$52(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):629:637 -> c
-    58:58:void lambda$appendValueParameter$55(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):679:679 -> c
-    59:59:void lambda$appendTypeParameter$60(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):732:732 -> c
-    60:60:void lambda$appendTypeAlias$65(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):763:763 -> c
-    61:61:void lambda$appendKmVersionRequirement$77(java.lang.StringBuilder,java.util.List,java.lang.String):847:847 -> c
-    62:62:void lambda$appendKmContract$80(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):886:886 -> c
-    63:68:void lambda$appendKmEffect$84(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):906:911 -> c
-    69:92:void lambda$appendKmEffect$84(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):907:930 -> c
-    93:93:void lambda$appendKmEffectExpression$85(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):966:966 -> c
-    94:94:void lambda$appendKmEffectExpression$88(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):993:993 -> c
+    178:181:void com.android.tools.r8.kotlin.KotlinMetadataWriter.appendKmHelper(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.utils.Action,java.lang.String,java.lang.String):162:165 -> b
+    178:181:void appendKmSection(java.lang.String,java.lang.String,java.lang.StringBuilder,java.util.function.Consumer):170 -> b
+    185:185:void lambda$appendKmSection$5(java.util.function.Consumer,java.lang.String):173:173 -> b
+    186:188:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):242:244 -> b
+    189:208:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):243:262 -> b
+    209:209:void lambda$appendKmDeclarationContainer$14(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):238:238 -> b
+    210:210:void lambda$appendKmDeclarationContainer$13(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):264:264 -> b
+    211:211:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):324:324 -> b
+    212:212:void lambda$appendKmClass$21(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):320:320 -> b
+    213:222:void lambda$appendKmConstructor$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):406:415 -> b
+    223:225:void lambda$appendKmConstructor$29(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor,java.lang.String):414:416 -> b
+    226:226:void lambda$appendKmFunction$31(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):437:437 -> b
+    227:227:void lambda$appendKmProperty$37(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):489:489 -> b
+    228:228:void lambda$appendKmType$44(java.lang.String,java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):576:576 -> b
+    229:229:void lambda$appendKmType$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):593:593 -> b
+    230:235:void lambda$appendKmType$46(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound,java.lang.String):589:594 -> b
+    236:236:void lambda$appendKmType$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):614:614 -> b
+    237:237:void lambda$appendKmType$49(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):610:610 -> b
+    238:246:void lambda$appendKmTypeProjection$52(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection,java.lang.String):629:637 -> b
+    247:247:void appendValueParameters(java.lang.String,java.lang.StringBuilder,java.util.List):644:644 -> b
+    248:248:void lambda$appendValueParameter$55(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):679:679 -> b
+    249:249:void lambda$appendTypeParameter$58(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):718:718 -> b
+    250:250:void lambda$appendTypeAlias$63(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):755:755 -> b
+    251:251:void lambda$appendTypeAlias$65(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):763:763 -> b
+    252:252:void lambda$appendKmContract$80(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):886:886 -> b
+    253:258:void lambda$appendKmEffect$84(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):906:911 -> b
+    259:282:void lambda$appendKmEffect$84(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect,java.lang.String):907:930 -> b
+    283:283:void lambda$appendKmEffectExpression$85(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):966:966 -> b
+    284:284:void lambda$appendKmEffectExpression$86(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):979:979 -> b
+    1:3:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):276:278 -> c
+    4:4:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):272:272 -> c
+    5:5:void lambda$appendKmPackage$17(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):299:299 -> c
+    6:6:void lambda$appendKmClass$22(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):342:342 -> c
+    7:7:void lambda$appendKmFunction$32(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):442:442 -> c
+    8:8:void lambda$appendKmFunction$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):458:458 -> c
+    9:9:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):494:494 -> c
+    10:64:void lambda$appendKmType$50(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):551:605 -> c
+    65:74:void lambda$appendValueParameter$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):665:674 -> c
+    75:93:void lambda$appendTypeParameter$62(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):703:721 -> c
+    94:94:void lambda$appendTypeParameter$60(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):732:732 -> c
+    95:95:void lambda$appendTypeAlias$66(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):772:772 -> c
+    96:96:void lambda$appendKmEffectExpression$87(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):977:977 -> c
+    97:97:void lambda$appendKmEffectExpression$87(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):973:973 -> c
+    98:98:void lambda$appendKmEffectExpression$88(java.lang.StringBuilder,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression):993:993 -> c
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):0:0 -> d
     1:1:void lambda$appendKmClass$24(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):372 -> d
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> d
@@ -94864,63 +94496,52 @@
     3:3:void lambda$appendKmClass$24(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):372 -> d
     4:4:void lambda$appendKmClass$24(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):372:372 -> d
     5:5:void lambda$appendKmClass$24(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):368:368 -> d
-    6:8:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):276:278 -> d
-    9:9:void lambda$appendKmDeclarationContainer$16(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.lang.String):272:272 -> d
-    10:10:void lambda$appendKmFunction$32(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):442:442 -> d
-    11:11:void lambda$appendKmFunction$34(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract,java.lang.String):458:458 -> d
-    12:12:void lambda$appendKmProperty$38(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):494:494 -> d
-    13:67:void lambda$appendKmType$50(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):551:605 -> d
-    68:77:void lambda$appendValueParameter$56(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter,java.lang.String):665:674 -> d
-    78:96:void lambda$appendTypeParameter$62(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter,java.lang.String):703:721 -> d
-    97:97:void lambda$appendTypeAlias$66(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):772:772 -> d
-    98:98:void lambda$appendKmEffectExpression$87(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):977:977 -> d
-    99:99:void lambda$appendKmEffectExpression$87(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):973:973 -> d
+    6:6:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):447:447 -> d
+    7:7:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):501:501 -> d
+    8:8:void lambda$appendTypeAlias$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):779:779 -> d
+    9:9:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):991:991 -> d
+    10:10:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):987:987 -> d
     1:3:void lambda$appendKmClass$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):387:389 -> e
     4:7:void lambda$appendKmClass$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):388:391 -> e
     8:8:void lambda$appendKmClass$27(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String):383:383 -> e
-    9:9:void lambda$appendKmFunction$33(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):447:447 -> e
-    10:10:void lambda$appendKmProperty$39(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):501:501 -> e
-    11:11:void lambda$appendTypeAlias$67(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):779:779 -> e
-    12:12:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):991:991 -> e
-    13:13:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):987:987 -> e
-    1:28:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):426:453 -> f
-    29:29: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 -> f
-    29:29:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):80 -> f
-    29:29:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):461 -> f
-    30:30:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):80:80 -> f
-    30:30:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):461 -> f
-    31:33:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):462:462 -> f
-    34:34: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 -> f
-    34:34:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):90 -> f
-    34:34:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):468 -> f
-    35:35:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):90:90 -> f
-    35:35:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):468 -> f
-    36:36:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):464:464 -> f
-    37:62:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):478:503 -> f
-    63:63:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):99:99 -> f
-    63:63:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):503 -> f
-    64:64:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):503:503 -> f
-    65:65:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getFieldSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):110:110 -> f
-    65:65:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):504 -> f
-    66:71:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):505:505 -> f
-    72:72:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):121:121 -> f
-    72:72:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):510 -> f
-    73:78:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):511:511 -> f
-    79:79:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):132:132 -> f
-    79:79:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):516 -> f
-    80:85:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):517:517 -> f
-    86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):143:143 -> f
-    86:86:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):523 -> f
-    87:94:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):524:524 -> f
-    95:95:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):143:143 -> f
-    95:95:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):532 -> f
-    96:101:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):533:533 -> f
-    102:139:void lambda$appendTypeAlias$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):744:781 -> f
-    140:147:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):946:953 -> f
-    148:161:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):947:960 -> f
-    162:190:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):954:982 -> f
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.Zz:
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.aA:
+    9:36:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):426:453 -> e
+    37:37: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 -> e
+    37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):80 -> e
+    37:37:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):461 -> e
+    38:38:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):80:80 -> e
+    38:38:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):461 -> e
+    39:41:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):462:462 -> e
+    42:42: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 -> e
+    42:42:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):90 -> e
+    42:42:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):468 -> e
+    43:43:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLambdaClassOriginName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):90:90 -> e
+    43:43:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):468 -> e
+    44:44:void lambda$appendKmFunction$35(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,java.lang.String):464:464 -> e
+    45:70:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):478:503 -> e
+    71:71:int com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getJvmFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):99:99 -> e
+    71:71:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):503 -> e
+    72:72:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):503:503 -> e
+    73:73:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getFieldSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):110:110 -> e
+    73:73:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):504 -> e
+    74:79:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):505:505 -> e
+    80:80:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):121:121 -> e
+    80:80:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):510 -> e
+    81:86:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):511:511 -> e
+    87:87:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):132:132 -> e
+    87:87:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):516 -> e
+    88:93:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):517:517 -> e
+    94:94:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):143:143 -> e
+    94:94:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):523 -> e
+    95:102:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):524:524 -> e
+    103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):143:143 -> e
+    103:103:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):532 -> e
+    104:109:void lambda$appendKmProperty$40(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty,java.lang.String):533:533 -> e
+    110:147:void lambda$appendTypeAlias$68(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias,java.lang.String):744:781 -> e
+    148:155:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):946:953 -> e
+    156:169:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):947:960 -> e
+    170:198:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):954:982 -> e
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.Sz:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.Tz:
     java.util.List partClassNames -> a
     int[] metadataVersion -> c
     java.lang.String packageName -> b
@@ -94957,7 +94578,7 @@
     376:376:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):92:92 -> a
     1:1:java.lang.String getPackageName():82:82 -> l
     1:1:int[] getMetadataVersion():87:87 -> m
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.bA:
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.Uz:
     int[] metadataVersion -> d
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
@@ -94972,7 +94593,7 @@
     16:16:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):90:90 -> a
     1:1:java.lang.String getPackageName():80:80 -> l
     1:1:int[] getMetadataVersion():85:85 -> m
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.cA:
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.Vz:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> d
     java.lang.String moduleName -> a
@@ -95004,7 +94625,7 @@
     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.dA:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.Wz:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForDelegate -> o
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
@@ -95048,7 +94669,7 @@
     1:1:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo getFieldSignature():131:131 -> n
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getGetterSignature():135:135 -> o
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSetterSignature():139:139 -> p
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.gA:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.Zz:
     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
@@ -95148,7 +94769,7 @@
     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$BufferedStringReader -> com.android.tools.r8.internal.eA:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.Xz:
     java.io.BufferedReader reader -> b
     java.lang.String readLine -> c
     boolean $assertionsDisabled -> d
@@ -95179,23 +94800,23 @@
     1:1:java.lang.String readNextLine():51:51 -> c
     1:1:void close():119:119 -> close
     1:73:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):0:72 -> d
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.fA:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.Yz:
     1:1:void <init>(java.lang.String):36:36 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.gA$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.Zz$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.gA$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.Zz$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.gA$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.Zz$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>
@@ -95204,15 +94825,15 @@
     1:1:java.lang.String getPath():342:342 -> b
     1:1:java.lang.String toString():347:347 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":349,"2":350,"3":351}}
-    349:349:java.lang.String toString():347:347 -> toString
-    350:350:java.lang.String toString():347:347 -> toString
-    351:351:java.lang.String toString():347:347 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.internal.hA:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5}}
+    3:3:java.lang.String toString():347:347 -> toString
+    4:4:java.lang.String toString():347:347 -> toString
+    5:5:java.lang.String toString():347:347 -> toString
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.internal.aA:
     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.iA:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.bA:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> d
     int[] metadataVersion -> c
@@ -95255,7 +94876,7 @@
     1:1:java.lang.String getPackageName():98:98 -> 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.jA:
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.cA:
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> d
     java.util.List typeParameters -> e
@@ -95271,7 +94892,7 @@
     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.kA:
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.dA:
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> g
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> d
@@ -95331,7 +94952,7 @@
     96:96:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):134:134 -> a
     97:97:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):136:136 -> a
     98:98:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):140:140 -> a
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.lA:
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.eA:
     java.util.List annotations -> f
     java.util.List originalUpperBounds -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> d
@@ -95362,7 +94983,7 @@
     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.mA:
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.fA:
     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>
@@ -95372,7 +94993,7 @@
     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.nA:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.gA:
     com.android.tools.r8.graph.DexType known -> a
     java.lang.String originalName -> b
     boolean $assertionsDisabled -> c
@@ -95412,7 +95033,7 @@
     7:7:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> o
     7:7:java.lang.String toKotlinClassifier(boolean):103 -> o
     1:1:java.lang.String toString():152:152 -> toString
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.oA:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.hA:
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> d
     java.util.List EMPTY_VALUE_PARAMETERS -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> c
@@ -95424,14 +95045,14 @@
     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.qA:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.jA:
     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.pA:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.iA:
     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
@@ -95445,7 +95066,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:9:void com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):78:80 -> a
     7:9: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.xC:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.qC:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -95844,7 +95465,7 @@
     3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):135 -> b
     1:7:boolean equals(java.lang.Object):193:199 -> equals
     1:1:int hashCode():204:204 -> hashCode
-com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.kh:
+com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.fh:
     java.nio.file.Path path -> c
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> d
@@ -96060,7 +95681,7 @@
     5:12:void lambda$replaceDexItemBasedConstString$1(com.android.tools.r8.graph.DexProgramClass):142 -> b
     13:13:void lambda$replaceDexItemBasedConstString$1(com.android.tools.r8.graph.DexProgramClass):144:144 -> b
     1:4:void run(java.util.concurrent.ExecutorService):54:57 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.Hn:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.Dn:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> b
     boolean $assertionsDisabled -> c
@@ -96101,11 +95722,11 @@
     239:242: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):218 -> a
     243:246:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):341:344 -> a
     243:246: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):218 -> a
-    247:247:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> a
+    247:247:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> a
     247:247:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344 -> a
     247:247: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):218 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    248:248:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> a
+    248:248:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> a
     248:248:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):344 -> a
     248:248: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):218 -> a
     249:258:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):343:352 -> a
@@ -96136,26 +95757,26 @@
     774:774: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):374:374 -> a
     775:775: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):374:374 -> a
     761:772: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):374:385 -> a
-com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.Kn:
+com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.Gn:
     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
     1:89:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):73:161 -> a
     90:96:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):114:120 -> a
     97:102:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):186:191 -> a
-    103:103:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    103:103:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     103:103:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):191 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    104:104:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    104:104:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     104:104:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):191 -> a
     105:106:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):205:206 -> a
     107:107:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
     107:107:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):209 -> a
     108:109:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):210:211 -> a
-    110:110:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> a
+    110:110:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> a
     110:110:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):211 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    111:111:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> a
+    111:111:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> a
     111:111:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):211 -> a
     112:112:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):213:213 -> a
     113:119:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):212:218 -> a
@@ -96481,7 +96102,7 @@
     int getDictionaryIndex() -> a
     int incrementDictionaryIndex() -> b
     int incrementNameIndex() -> c
-com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.tD:
+com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.mD:
     com.android.tools.r8.naming.MapVersion[] $VALUES -> h
     com.android.tools.r8.naming.MapVersion MAP_VERSION_UNKNOWN -> g
     com.android.tools.r8.naming.MapVersion MAP_VERSION_EXPERIMENTAL -> f
@@ -96636,20 +96257,20 @@
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> b
     2:2:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):158:158 -> b
     3:3:java.util.function.Function getNamingKeyTransform():166:166 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     4:4:java.util.function.Function getNamingKeyTransform():166 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     5:5:java.util.function.Function getNamingKeyTransform():166 -> b
     6:7:java.util.function.Function getNamingKeyTransform():167:168 -> b
     8:20:void lambda$reserveNamesInClasses$6(com.android.tools.r8.graph.DexClass):288:300 -> b
     21:21:void lambda$reserveNamesInClasses$6(com.android.tools.r8.graph.DexClass):297:297 -> b
     1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> c
     2:3:java.util.function.Function getReservationKeyTransform():155:156 -> c
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> c
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> c
     4:4:java.util.function.Function getReservationKeyTransform():156 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> c
     5:5:java.util.function.Function getReservationKeyTransform():156 -> c
     6:9:java.util.function.Function getReservationKeyTransform():158:161 -> c
     10:10:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):161:161 -> c
@@ -96679,11 +96300,11 @@
     2:2:com.android.tools.r8.naming.MethodNamingState createChild(com.android.tools.r8.naming.MethodReservationState):44:44 -> a
     3:3:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod):49:49 -> a
     4:17:com.android.tools.r8.graph.DexString newOrReservedNameFor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):54:67 -> a
-    18:29:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):83:94 -> a
-    30:36:java.util.Set getUsedBy(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):98:104 -> a
-    37:40:com.android.tools.r8.naming.MethodNamingState$InternalNewNameState createInternalState(com.android.tools.r8.graph.DexMethod):124:127 -> a
-    37:40:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):19 -> a
+    18:24:java.util.Set getUsedBy(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):98:104 -> a
+    25:28:com.android.tools.r8.naming.MethodNamingState$InternalNewNameState createInternalState(com.android.tools.r8.graph.DexMethod):124:127 -> a
+    25:28:java.lang.Object createInternalState(com.android.tools.r8.graph.DexMethod):19 -> a
     1:3:com.android.tools.r8.graph.DexString nextName(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.BiPredicate):71:73 -> b
+    4:15:boolean isAvailable(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexMethod):83:94 -> b
     1:6:com.android.tools.r8.graph.DexString getAssignedName(com.android.tools.r8.graph.DexMethod):111:116 -> d
 com.android.tools.r8.naming.MethodNamingState$InternalNewNameState -> com.android.tools.r8.naming.C:
     java.util.Map originalToRenamedNames -> c
@@ -96858,42 +96479,42 @@
     42:47:com.android.tools.r8.graph.DexProto lookupProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexItemFactory):105:105 -> a
     48:48:com.android.tools.r8.graph.DexType lambda$lookupProto$2(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):108:108 -> a
     49:49:com.android.tools.r8.graph.DexType[] lambda$lookupProto$3(int):109:109 -> a
-    50:50:com.android.tools.r8.naming.NamingLens getIdentityLens():133:133 -> a
-    51:56:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):155:160 -> a
-    57:57:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":587,"2":588,"3":589}}
-    587:587:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
-    588:588:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
-    589:589:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
-    58:58:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":590,"2":591,"3":592,"4":593}}
-    590:590:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:161 -> a
-    591:591:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:161 -> a
-    592:592:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:161 -> a
-    593:593:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:161 -> a
-    219:223:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:165 -> a
-    224:228:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):91:91 -> a
-    224:228:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):165 -> a
-    229:230:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):166:167 -> a
-    231:231:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":599,"2":600,"3":601}}
-    599:599:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):167:167 -> a
-    600:600:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):167:167 -> a
-    601:601:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):167:167 -> a
-    399:403:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):168:172 -> a
-    404:408:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):98:98 -> a
-    404:408:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):172 -> a
-    409:410:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):173:174 -> a
-    411:411:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+    50:58:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):113:121 -> a
+    59:59:com.android.tools.r8.naming.NamingLens getIdentityLens():133:133 -> a
+    60:65:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):155:160 -> a
+    66:66:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":596,"2":597,"3":598}}
+    596:596:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
+    597:597:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
+    598:598:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):160:160 -> a
+    67:67:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":599,"2":600,"3":601,"4":602}}
+    599:599:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:161 -> a
+    600:600:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:161 -> a
+    601:601:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:161 -> a
+    602:602:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:161 -> a
+    228:232:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):161:165 -> a
+    233:237:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):91:91 -> a
+    233:237:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):165 -> a
+    238:239:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):166:167 -> a
+    240:240:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":608,"2":609,"3":610}}
-    608:608:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
-    609:609:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
-    610:610:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
-    586:586:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):175:175 -> a
+    608:608:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):167:167 -> a
+    609:609:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):167:167 -> a
+    610:610:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):167:167 -> a
+    408:412:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):168:172 -> a
+    413:417:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):98:98 -> a
+    413:417:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):172 -> a
+    418:419:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):173:174 -> a
+    420:420:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":617,"2":618,"3":619}}
+    617:617:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
+    618:618:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
+    619:619:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):174:174 -> a
+    595:595:boolean verifyNoCollisions(java.lang.Iterable,com.android.tools.r8.graph.DexItemFactory):175:175 -> a
     boolean hasPrefixRewritingLogic() -> b
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
     1:2:com.android.tools.r8.graph.DexString lookupClassDescriptor(com.android.tools.r8.graph.DexType):44:45 -> b
-    3:11:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):113:121 -> b
     com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType) -> c
     1:1:boolean isIdentityLens():137:137 -> c
     1:2:java.lang.String lookupInternalName(com.android.tools.r8.graph.DexType):141:142 -> d
@@ -97017,7 +96638,7 @@
     68:68:void computeDefaultInterfaceMethodMethods():356 -> a
     68:68:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):142 -> a
     69:78:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):143:152 -> a
-    79:79:java.util.List com.android.tools.r8.graph.DexApplication.classesWithDeterministicOrder(java.util.Collection):136:136 -> a
+    79:79:java.util.List com.android.tools.r8.graph.DexApplication.classesWithDeterministicOrder(java.util.Collection):131:131 -> a
     79:79:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):153 -> a
     80:110:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):153:183 -> a
     111:113:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.DexType):107:109 -> a
@@ -97041,22 +96662,22 @@
     173:182:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):229:238 -> a
     183:196:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):233:246 -> a
     197:222:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):245:270 -> a
-    223:231:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):278:286 -> a
-    232:232:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):282:282 -> a
-    233:238:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):296:301 -> a
-    239:241:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):300:302 -> a
-    242:242:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
-    242:242:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302 -> a
-    243:250:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):303:310 -> a
-    251:253:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):309:311 -> a
-    254:254:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
-    254:254:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):311 -> a
-    255:257:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):312:314 -> a
-    258:260:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):321:321 -> a
-    262:265:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):323:326 -> a
+    223:223:void lambda$computeMapping$4(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):267:267 -> a
+    224:232:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):278:286 -> a
+    233:233:void lambda$addNonPrivateInterfaceMappings$6(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):282:282 -> a
+    234:239:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):296:301 -> a
+    240:242:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):300:302 -> a
+    243:243:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
+    243:243:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302 -> a
+    244:251:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):303:310 -> a
+    252:254:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):309:311 -> a
+    255:255:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
+    255:255:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):311 -> a
+    256:258:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):312:314 -> a
+    259:261:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):321:321 -> a
+    263:266:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):323:326 -> a
     1:1:void lambda$computeMapping$3(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):211:211 -> b
-    2:2:void lambda$computeMapping$4(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):267:267 -> b
-    1:1:void lambda$computeMapping$5(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):272:272 -> c
+    2:2:void lambda$computeMapping$5(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):272:272 -> b
 com.android.tools.r8.naming.ProguardMapMinifier$ApplyMappingClassNamingStrategy -> com.android.tools.r8.naming.V:
     java.util.Set mappedNames -> h
     boolean $assertionsDisabled -> i
@@ -97351,12 +96972,12 @@
     1224:1224:java.lang.String toString():608:608 -> toString
     610:610:java.lang.String toString():608:608 -> toString
     611:611:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1226,"2":1227,"3":1228}}
-    1226:1226:java.lang.String toString():610:610 -> toString
-    1227:1227:java.lang.String toString():610:610 -> toString
-    1228:1228:java.lang.String toString():610:610 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1222,"2":1223,"3":1224}}
+    1222:1222:java.lang.String toString():610:610 -> toString
+    1223:1223:java.lang.String toString():610:610 -> toString
+    1224:1224:java.lang.String toString():610:610 -> toString
     1221:1221:java.lang.String toString():610:610 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.tN:
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.jN:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.utils.Reporter reporter -> d
@@ -97401,11 +97022,11 @@
     13:15:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():81 -> a
     19:21:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):118:120 -> a
     19:21:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():81 -> a
-    22:22:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1778:1778 -> a
+    22:22:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1766:1766 -> a
     22:22:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):120 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     22:22:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():81 -> a
-    23:25:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1778:1780 -> a
+    23:25:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1766:1768 -> a
     23:25:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):120 -> a
     23:25:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():81 -> a
     26:30:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):121:125 -> a
@@ -97424,11 +97045,11 @@
     43:43:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():82 -> a
     44:44:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():83:83 -> a
     1:1:com.android.tools.r8.StringConsumer access$200(com.android.tools.r8.naming.ProguardMapSupplier):23:23 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.tN$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.jN$a:
     1:29:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult validateProguardMapHash(java.lang.String):257:285 -> a
     1:1:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> accept
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):202:202 -> finished
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult -> com.android.tools.r8.internal.tN$a$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult -> com.android.tools.r8.internal.jN$a$a:
     boolean error -> a
     java.lang.String message -> b
     boolean $assertionsDisabled -> c
@@ -97440,7 +97061,7 @@
     2:3:java.lang.String getMessage():248:249 -> b
     1:1:boolean isError():244:244 -> c
     1:1:boolean isOk():240:240 -> d
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.uN:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.kN:
     java.lang.String id -> a
     java.lang.String hash -> b
     boolean $assertionsDisabled -> c
@@ -97449,7 +97070,7 @@
     2:6:void <init>(java.lang.String,java.lang.String):41:45 -> <init>
     1:1:java.lang.String getHash():55:55 -> a
     1:1:java.lang.String getId():50:50 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.wN:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.mN:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:3:void <init>():140:142 -> <init>
     1:1:java.lang.String lambda$getProviderOrDefault$0(com.android.tools.r8.MapIdEnvironment):147:147 -> a
@@ -97460,16 +97081,16 @@
     5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build(com.android.tools.r8.MapIdProvider):167 -> a
     6:7:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build(com.android.tools.r8.MapIdProvider):167:168 -> a
     1:1:com.android.tools.r8.MapIdProvider getProviderOrDefault(com.android.tools.r8.MapIdProvider):147:147 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder$1 -> com.android.tools.r8.internal.vN:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder$1 -> com.android.tools.r8.internal.lN:
     java.lang.String val$hash -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder,java.lang.String):151:151 -> <init>
     1:1:java.lang.String getMapHash():154:154 -> getMapHash
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.xN:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.nN:
     com.android.tools.r8.naming.ProguardMapSupplier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):172:172 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):176:176 -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):172 -> a
-com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.FP:
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.vP:
     int to -> b
     boolean isCardinal -> c
     int from -> a
@@ -97583,7 +97204,7 @@
     6:7:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):59:60 -> a
     6:7:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):40 -> a
     8:9:com.android.tools.r8.naming.SeedMapper build():73:74 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.sV:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.iV:
     1:2:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):20:21 -> a
     3:3:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.rewriteToDefaultSourceFile(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     3:3:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):21 -> a
@@ -97620,13 +97241,13 @@
     18:18:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.rewriteToDefaultSourceFile(com.android.tools.r8.graph.DexItemFactory):61 -> a
     18:18:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.computeNonCompatProvider(com.android.tools.r8.utils.InternalOptions):46 -> a
     18:18:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):26 -> a
-com.android.tools.r8.naming.SourceFileRewriter$1 -> com.android.tools.r8.internal.rV:
+com.android.tools.r8.naming.SourceFileRewriter$1 -> com.android.tools.r8.internal.hV:
     java.lang.String val$renaming -> a
     boolean val$allowDiscard -> b
     1:1:void <init>(java.lang.String,boolean):65:65 -> <init>
     1:1:boolean allowDiscardingSourceFile():73:73 -> allowDiscardingSourceFile
     1:1:java.lang.String get(com.android.tools.r8.SourceFileEnvironment):68:68 -> get
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.va:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.ua:
     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
@@ -97667,7 +97288,7 @@
     2:2:boolean needsToRegisterReference():149 -> f
     1:1:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo none():139:139 -> g
     1:1:int hashCode():183:183 -> hashCode
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.ua:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.ta:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> b
     boolean $assertionsDisabled -> h
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> c
@@ -97688,14 +97309,14 @@
     125:126:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getCanonicalNameFromDescriptor(java.lang.String):337:338 -> a
     125:126:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):61 -> a
     127:127:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":234,"2":235,"3":236}}
-    234:234: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
-    235:235: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
-    236:236: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
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":231,"2":232,"3":233}}
+    231:231: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
+    232:232: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
+    233:233: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
     190:190: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
     191:191: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
     192:230: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.Pj:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.Kj:
     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>
@@ -97703,7 +97324,7 @@
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
     1:1:com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo forFieldName():21:21 -> g
-com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.lG:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.eG:
     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
@@ -97721,7 +97342,7 @@
     boolean isRecordFieldNamesComputationInfo() -> d
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.eQ:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.UP:
     com.android.tools.r8.graph.DexField[] fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():38:38 -> <clinit>
@@ -97743,7 +97364,7 @@
     boolean isRecordFieldNamesComputationInfo() -> d
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.cQ:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.SP:
     1:1:void <init>(com.android.tools.r8.graph.DexField[]):70:70 -> <init>
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):79:79 -> a
     2:2:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):84:84 -> a
@@ -97755,29 +97376,29 @@
     6:10:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.NamingLens.lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):91:91 -> a
     6:10:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85 -> a
     11:14:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85:88 -> a
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.dQ:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.TP:
     java.lang.String[] fieldNames -> c
     1:1:void <init>(java.lang.String[],com.android.tools.r8.graph.DexField[],com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$1):46:46 -> <init>
     2:3:void <init>(java.lang.String[],com.android.tools.r8.graph.DexField[]):52:53 -> <init>
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):62:62 -> a
     2:2:java.lang.String lambda$internalComputeNameFor$0(int):62:62 -> a
-com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.L9:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():634:634 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():633:633 -> a
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.ta:
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.sa:
     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.Zg:
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Ug:
     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.eh:
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Zg:
     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.Gn:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.Cn:
     com.android.tools.r8.graph.DexReference reference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -97790,17 +97411,17 @@
     3:3:com.android.tools.r8.graph.DexReference getReference():56:56 -> b
     boolean isTypeResult() -> c
     1:1: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.In:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.En:
     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.Jn:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.Fn:
     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.u00:
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.k00:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.Ac:
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>(com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1):12:12 -> <init>
@@ -97816,7 +97437,7 @@
     5:5:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):51:51 -> a
     boolean isCompilerSynthesizedMappingInformation() -> f
     1:3:java.lang.String serialize():56:58 -> i
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.internal.Ac:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.internal.zc:
     1:1:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation build():20:20 -> a
 com.android.tools.r8.naming.mappinginformation.FileNameInformation -> com.android.tools.r8.naming.mappinginformation.a:
     java.lang.String fileName -> a
@@ -97882,7 +97503,7 @@
     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.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.VK:
+com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.LK:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap positions -> a
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -97915,7 +97536,7 @@
     120:120:void lambda$deserialize$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.util.Map$Entry):92:92 -> a
     com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation asOutlineCallsiteInformation() -> c
     1:9:java.lang.String serialize():35:43 -> i
-com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.XK:
+com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.NK:
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -97924,7 +97545,7 @@
     1:1:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):44 -> a
     2:2:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):45:45 -> a
     1:3:java.lang.String serialize():24:26 -> i
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.GT:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.wT:
     java.util.List actions -> b
     java.util.List conditions -> a
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> c
@@ -98060,42 +97681,42 @@
     17:17:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
     17:17:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
     18:18:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":31,"2":32,"3":33,"4":34,"5":35}}
-    31:31:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
-    31:31:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    31:31:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    32:32:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
-    32:32:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    32:32:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    33:33:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
-    33:33:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    33:33:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    34:34:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
-    34:34:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    34:34:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    35:35:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
-    35:35:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    35:35:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":26,"2":27,"3":28,"4":29,"5":30}}
+    26:26:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
+    26:26:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    26:26:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    27:27:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
+    27:27:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    27:27:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    28:28:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
+    28:28:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    28:28:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    29:29:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
+    29:29:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    29:29:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    30:30:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:219 -> b
+    30:30:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    30:30:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
     19:20:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):219:220 -> b
     19:20:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
     19:20:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
     21:21:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":36,"2":37,"3":38,"4":39,"5":40}}
-    36:36:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
-    36:36:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    36:36:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    37:37:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
-    37:37:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    37:37:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    38:38:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
-    38:38:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    38:38:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    39:39:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
-    39:39:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    39:39:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    40:40:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
-    40:40:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    40:40:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":26,"2":27,"3":28,"4":29,"5":30}}
+    26:26:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
+    26:26:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    26:26:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    27:27:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
+    27:27:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    27:27:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    28:28:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
+    28:28:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    28:28:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    29:29:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
+    29:29:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    29:29:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    30:30:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
+    30:30:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    30:30:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
     22:22:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):220:220 -> b
     22:22:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
     22:22:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
@@ -98103,22 +97724,22 @@
     23:23:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
     23:23:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
     24:24:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41,"2":42,"3":43,"4":44,"5":45}}
-    41:41:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
-    41:41:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    41:41:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    42:42:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
-    42:42:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    42:42:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    43:43:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
-    43:43:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    43:43:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    44:44:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
-    44:44:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    44:44:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
-    45:45:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
-    45:45:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
-    45:45:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":26,"2":27,"3":28,"4":29,"5":30}}
+    26:26:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
+    26:26:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    26:26:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    27:27:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
+    27:27:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    27:27:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    28:28:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
+    28:28:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    28:28:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    29:29:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
+    29:29:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    29:29:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
+    30:30:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
+    30:30:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
+    30:30:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
     25:25:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.deserialize(com.android.tools.r8.com.google.gson.JsonElement):212:212 -> b
     25:25:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction.access$100(com.android.tools.r8.com.google.gson.JsonElement):203 -> b
     25:25:void lambda$deserialize$3(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.com.google.gson.JsonElement):94 -> b
@@ -98126,18 +97747,18 @@
     1:9:java.lang.String serialize():57:65 -> i
     1:1:java.util.List getActions():47:47 -> j
     1:1:java.util.List getConditions():43:43 -> k
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> com.android.tools.r8.internal.BT:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> com.android.tools.r8.internal.rT:
     java.util.List actions -> b
     java.util.List conditions -> a
     1:4:void <init>():112:115 -> <init>
     1:1:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder addCondition(com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):118:118 -> a
     2:2:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder addRewriteAction(com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction):123:123 -> a
     3:3:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation build():128:128 -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> com.android.tools.r8.internal.CT:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> com.android.tools.r8.internal.sT:
     1:1:void <init>():132:132 -> <init>
     boolean evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl) -> a
     com.android.tools.r8.com.google.gson.JsonPrimitive serialize() -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.DT:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.tT:
     int numberOfFrames -> b
     1:2:void <init>(int):240:241 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
@@ -98154,13 +97775,13 @@
     509:509:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
     503:503:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
     510:510:void evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder):265:265 -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> com.android.tools.r8.internal.ET:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> com.android.tools.r8.internal.uT:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():203:203 -> <clinit>
     1:1:void <init>():203:203 -> <init>
     void evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder) -> a
     com.android.tools.r8.com.google.gson.JsonElement serialize() -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.FT:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.vT:
     com.android.tools.r8.references.ClassReference classReference -> a
     1:2:void <init>(com.android.tools.r8.references.ClassReference):167:168 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonPrimitive serialize():173:173 -> a
@@ -98184,7 +97805,7 @@
     186:186:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition deserialize(java.lang.String):193 -> a
     187:187:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition deserialize(java.lang.String):193:193 -> a
     193:193:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition create(com.android.tools.r8.references.ClassReference):199:199 -> a
-com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.E00:
+com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.u00:
     java.lang.String id -> a
     java.lang.String payload -> b
     1:3:void <init>(java.lang.String,java.lang.String):16:18 -> <init>
@@ -98194,19 +97815,19 @@
     1:1:java.lang.String serialize():32:32 -> i
     1:1:java.lang.String getId():23:23 -> j
     1:1:java.lang.String getPayload():27:27 -> k
-com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Tl:
+com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Ol:
     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
-com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Tl$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Ol$a:
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition MEMBER_ANNOTATION -> d
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> c
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> b
     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.Vl:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Ql:
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> a
     char[] buffer -> e
     int pos -> f
@@ -98322,7 +97943,7 @@
     123:123:void parseMethodSignature(java.lang.String):103:103 -> c
     128:138:void scanSymbol():364:374 -> c
     1:17:void updateFormalTypeParameter():175:191 -> d
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Wl:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Rl:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
     com.android.tools.r8.graph.GenericSignatureContextBuilder contextBuilder -> c
@@ -98354,7 +97975,7 @@
     74:77: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
     78:78: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
     79:79: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.E9:
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.D9:
     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
@@ -98422,7 +98043,7 @@
     118:118:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166 -> a
     119:119:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
     119:119:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166 -> a
-com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.ak:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Vj:
     boolean $assertionsDisabled -> g
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     1:1:void <clinit>():23:23 -> <clinit>
@@ -98441,19 +98062,19 @@
     7:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):50:51 -> b
     9:9:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):65:65 -> b
     10:10:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):83:83 -> b
+    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):111:113 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):111:113 -> d
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     boolean hasCodeRewritings() -> e
     1:1:boolean isContextFreeForMethods():118:118 -> g
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Zj:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Uj:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> a
     1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):121:121 -> <init>
     2:2:void <init>():126:126 -> <init>
     3:3:void <init>():123:123 -> <init>
     1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):130:130 -> a
     2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):137:138 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.Gu:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.zu:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> e
     com.android.tools.r8.graph.DexMethod target -> f
     boolean $assertionsDisabled -> g
@@ -98486,7 +98107,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):98 -> g
     2:2:com.android.tools.r8.graph.DexMethod getTarget():39:39 -> g
     3:3:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):53:53 -> g
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.RD:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.KD:
     com.android.tools.r8.optimize.MemberRebindingLens$Builder lensBuilder -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -98509,7 +98130,7 @@
     26:26:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):75 -> a
     27:34:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):75:82 -> a
     35:51:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):78:94 -> a
-    52:52: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):322:322 -> a
+    52:52: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):309:309 -> a
     52:52:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):94 -> a
     53:57:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):100:104 -> a
     58:58:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):103:103 -> a
@@ -98579,11 +98200,11 @@
     224:238:void lambda$computeMethodRebinding$4(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):289:303 -> a
     239:239:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):365:365 -> a
     239:239:void lambda$computeMethodRebinding$4(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):310 -> a
-    240:240:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    240:240:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     240:240:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):365 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     240:240:void lambda$computeMethodRebinding$4(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):310 -> a
-    241:241:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    241:241:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     241:241:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):365 -> a
     241:241:void lambda$computeMethodRebinding$4(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):310 -> a
     242:245:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):365:368 -> a
@@ -98623,7 +98244,7 @@
     1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):251:251 -> c
     2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):482:486 -> c
     1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):491:508 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.QD:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.JD:
     com.android.tools.r8.optimize.MemberRebindingAnalysis this$0 -> f
     java.util.Set val$nonReboundFieldReferences -> e
     1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.Set):520:520 -> <init>
@@ -98642,7 +98263,7 @@
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):539:539 -> g
     1:4:void registerFieldReference(com.android.tools.r8.graph.DexField):543:546 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.TD:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.MD:
     boolean $assertionsDisabled -> h
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> g
@@ -98684,12 +98305,12 @@
     7:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):63:64 -> b
     9:9:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):94:94 -> b
     10:10:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):112:112 -> b
+    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):134:136 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):134:136 -> d
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     boolean hasCodeRewritings() -> e
     1:1:boolean isContextFreeForMethods():141:141 -> g
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.SD:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.LD:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> d
@@ -98715,7 +98336,7 @@
     18:18:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):208:208 -> a
     18:18:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):221 -> a
     19:22:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():231:234 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.VD:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.OD:
     1:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):46:64 -> 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):71:71 -> 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
@@ -98729,7 +98350,7 @@
     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):92:92 -> a
     32:32:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):31:31 -> 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):99 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.UD:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.ND:
     java.util.Set seenFieldReferences -> h
     java.util.Set seenMethodReferences -> i
     com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder methodAccessInfoCollectionBuilder -> g
@@ -98763,7 +98384,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):143:143 -> g
     2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):204:204 -> g
     1:6:void registerFieldAccess(com.android.tools.r8.graph.DexField):147:152 -> i
-com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.XD:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.QD:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
     java.util.Map methodMaps -> g
@@ -98798,11 +98419,11 @@
     8:8:com.android.tools.r8.graph.DexField com.android.tools.r8.optimize.MemberRebindingLens.getReboundFieldReference(com.android.tools.r8.graph.DexField):115:115 -> b
     8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):110 -> b
     9:10:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):110:111 -> b
+    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):89:91 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):89:91 -> d
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     1:1:boolean isContextFreeForMethods():96:96 -> g
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.WD:
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.PD:
     java.util.Map methodMaps -> b
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -98817,7 +98438,7 @@
     11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):194:194 -> a
     11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189 -> a
     12:12:com.android.tools.r8.optimize.MemberRebindingLens build():198:198 -> a
-com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.EP:
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.uP:
     com.android.tools.r8.graph.AppView appView -> n
     boolean $assertionsDisabled -> p
     java.util.Set publicizedMethods -> o
@@ -98844,39 +98465,39 @@
     12:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):43 -> a
     13:17:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):44:48 -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
-    boolean isLegitimateToHaveEmptyMappings() -> m
-    1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():65:65 -> n
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.DP:
+    boolean isLegitimateToHaveEmptyMappings() -> n
+    1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():65:65 -> o
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.tP:
     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.j20:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.Z10:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):27:28 -> <init>
     1:19:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):33:51 -> a
-    1:19:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):94 -> a
+    1:19:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):91 -> a
     20:20:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isTargetingSuperMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind,com.android.tools.r8.graph.DexMethod):75:75 -> a
     20:20:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):51 -> a
-    20:20:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):94 -> a
+    20:20:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):91 -> a
     21:31:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):55:65 -> a
-    21:31:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):94 -> a
+    21:31:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):91 -> a
     32:32:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
-    32:32:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):94 -> a
+    32:32:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):91 -> a
     33:33:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isTargetingSuperMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind,com.android.tools.r8.graph.DexMethod):77:77 -> a
     33:33:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):51 -> a
-    33:33:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):94 -> a
-    34:34:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):95:95 -> a
-    35:41:void run(java.util.concurrent.ExecutorService):83:89 -> a
-    42:59:void run(java.util.concurrent.ExecutorService):88:105 -> a
-    60:68:void lambda$run$1(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexProgramClass):91:99 -> a
-    69:70:void lambda$run$3(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):107:108 -> a
-    71:71:void lambda$run$2(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexEncodedMethod):108:108 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator -> com.android.tools.r8.internal.M2:
+    33:33:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):91 -> a
+    34:34:void lambda$run$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):92:92 -> a
+    35:38:void run(java.util.concurrent.ExecutorService):83:86 -> a
+    39:56:void run(java.util.concurrent.ExecutorService):85:102 -> a
+    57:65:void lambda$run$1(java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.graph.DexProgramClass):88:96 -> a
+    66:67:void lambda$run$3(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):104:105 -> a
+    68:68:void lambda$run$2(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexEncodedMethod):105:105 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator -> com.android.tools.r8.internal.L2:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner codeScanner -> b
@@ -98917,7 +98538,7 @@
     134:137:void lambda$tearDownCodeScanner$2(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexMethodSignature):169:172 -> a
     138:138:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$tearDownCodeScanner$1(java.util.Set):171:171 -> a
     139:144:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):250:255 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer -> com.android.tools.r8.internal.O2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer -> com.android.tools.r8.internal.N2:
     com.android.tools.r8.graph.AppView appView -> f
     boolean $assertionsDisabled -> h
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens graphLens -> g
@@ -98935,10 +98556,10 @@
     24:25:void fixupClass(com.android.tools.r8.graph.DexProgramClass):76:77 -> a
     26:26:void lambda$fixupFields$1(com.android.tools.r8.graph.DexEncodedField$Builder):84:84 -> a
     27:34:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):106:113 -> a
-    35:35:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    35:35:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     35:35:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):98:98 -> a
+    36:36:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
     36:36:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):113 -> a
     37:39:void lambda$fixupMethods$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):114:116 -> a
     40:40:void lambda$fixupMethods$3(com.android.tools.r8.graph.MethodAccessFlags):115:115 -> a
@@ -98961,17 +98582,17 @@
     13:13:void lambda$fixupFields$2(com.android.tools.r8.graph.DexEncodedField$Builder):88:88 -> b
     14:22:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupMethods$5(com.android.tools.r8.graph.DexEncodedMethod):95:103 -> b
     1:2:void fixupMethods(com.android.tools.r8.graph.DexProgramClass):92:93 -> c
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer$1 -> com.android.tools.r8.internal.N2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer$1 -> com.android.tools.r8.internal.M2:
     com.android.tools.r8.graph.PrunedItems val$prunedItems -> b
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer this$0 -> c
     com.android.tools.r8.graph.GraphLens val$codeLens -> a
     1:1:void <init>(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorApplicationFixer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):130:130 -> <init>
     1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):134:134 -> a
     2:11:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):142:151 -> a
-    12:12:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():82:82 -> a
+    12:12:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.createMethodOptimizationInfoFixer():83:83 -> a
     12:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):151 -> a
     13:13:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):152:152 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner -> com.android.tools.r8.internal.P2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner -> com.android.tools.r8.internal.O2:
     com.android.tools.r8.ir.code.AliasedValueConfiguration aliasedValueConfiguration -> g
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory methodParameterFactory -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> f
@@ -99321,65 +98942,73 @@
     327:327:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):526 -> a
     328:330:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):527:529 -> a
     331:331:com.android.tools.r8.graph.DexMethod getRepresentative(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):528:528 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.S2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer -> com.android.tools.r8.internal.R2:
     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.Q2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$1 -> com.android.tools.r8.internal.P2:
     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.R2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer$2 -> com.android.tools.r8.internal.Q2:
     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.U2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens -> com.android.tools.r8.internal.T2:
     boolean $assertionsDisabled -> o
     java.util.Map prototypeChanges -> n
     1:1:void <clinit>():21:21 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):30:31 -> <init>
-    1:1:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> a
-    1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):104 -> a
-    2:5: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):105:108 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):89:89 -> a
-    6:6:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):75 -> a
-    7:7:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> a
-    7:7:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):76 -> a
-    8:11:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):80:83 -> a
-    12:12:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):81:81 -> a
-    1:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):60:67 -> b
-    1:1:com.android.tools.r8.graph.DexField internalGetNextFieldSignature(com.android.tools.r8.graph.DexField):94:94 -> d
-    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):89:89 -> e
-    1:1:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):99:99 -> f
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):92:92 -> a
+    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):78 -> a
+    2:2:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> a
+    2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):79 -> a
+    3:6:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):83:86 -> a
+    7:7:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):84:84 -> a
+    8:8: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):107:107 -> a
+    9:9:boolean com.android.tools.r8.ir.code.Invoke$Type.isStatic():189:189 -> a
+    9:9: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):107 -> a
+    10:10:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> a
+    10:10: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):107 -> a
+    11:12: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):108:109 -> a
+    13:13:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
+    13:13: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):109 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    14:14:boolean com.android.tools.r8.graph.proto.ArgumentInfoCollection.isArgumentRemoved(int):93:93 -> a
+    14:14: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):109 -> a
+    1:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):63:70 -> b
+    1:1:com.android.tools.r8.graph.DexField internalGetNextFieldSignature(com.android.tools.r8.graph.DexField):97:97 -> d
+    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):92:92 -> e
+    1:1:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):102:102 -> f
     1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):48:48 -> g
     2:2:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens.hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> g
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):48 -> g
     3:4:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexMethod):48:49 -> g
     1:1:boolean hasPrototypeChanges(com.android.tools.r8.graph.DexMethod):44:44 -> h
-    boolean isLegitimateToHaveEmptyMappings() -> m
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder -> com.android.tools.r8.internal.T2:
+    boolean isLegitimateToHaveEmptyMappings() -> n
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder -> com.android.tools.r8.internal.S2:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map prototypeChanges -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> b
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> c
-    1:1:void <clinit>():112:112 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):122:122 -> <init>
-    2:10:void <init>(com.android.tools.r8.graph.AppView):115:123 -> <init>
-    1:3:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.isEmpty():127:129 -> a
-    1:3:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():166 -> a
-    4:4:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():169:169 -> a
-    5:9:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.fixupPrototypeChangesAfterFieldSignatureChanges(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):178:182 -> a
-    5:9:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():172 -> a
-    10:13:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.fixupPrototypeChangesAfterFieldSignatureChanges(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):181:184 -> a
-    10:13:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():172 -> a
-    14:16:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder mergeDisjoint(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):134:136 -> a
-    17:18:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):141:142 -> a
-    19:26: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.proto.RewrittenPrototypeDescription):148:155 -> a
-    27:27: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.proto.RewrittenPrototypeDescription):153:153 -> a
-    28:28:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordStaticized(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):161:161 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorIROptimizer -> com.android.tools.r8.internal.V2:
+    1:1:void <clinit>():116:116 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):126:126 -> <init>
+    2:10:void <init>(com.android.tools.r8.graph.AppView):119:127 -> <init>
+    1:3:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.isEmpty():131:133 -> a
+    1:3:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():170 -> a
+    4:4:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():173:173 -> a
+    5:9:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.fixupPrototypeChangesAfterFieldSignatureChanges(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):182:186 -> a
+    5:9:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():176 -> a
+    10:13:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder.fixupPrototypeChangesAfterFieldSignatureChanges(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):185:188 -> a
+    10:13:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens build():176 -> a
+    14:16:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder mergeDisjoint(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):138:140 -> a
+    17:18:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):145:146 -> a
+    19:26: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.proto.RewrittenPrototypeDescription):152:159 -> a
+    27:27: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.proto.RewrittenPrototypeDescription):157:157 -> a
+    28:28:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder recordStaticized(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):165:165 -> a
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorIROptimizer -> com.android.tools.r8.internal.U2:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:24:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):40:63 -> a
@@ -99398,7 +99027,7 @@
     106:106:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):41:41 -> a
     106:106:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):151 -> a
     107:107:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):151:151 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer -> com.android.tools.r8.internal.X2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer -> com.android.tools.r8.internal.W2:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection reprocessingCriteriaCollection -> b
     boolean $assertionsDisabled -> c
@@ -99438,7 +99067,7 @@
     95:95:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):132 -> a
     96:98:void lambda$enqueueAffectedCallers$1(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,java.util.List,com.android.tools.r8.graph.ProgramMethod):132:134 -> a
     99:99:void lambda$enqueueAffectedCallers$3(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,java.util.List):143:143 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry -> com.android.tools.r8.internal.W2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry -> com.android.tools.r8.internal.V2:
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens graphLens -> g
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens):155:157 -> <init>
@@ -99459,7 +99088,7 @@
     1:9:void registerFieldAccess(com.android.tools.r8.graph.DexField):226:234 -> i
     10:10:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorMethodReprocessingEnqueuer$AffectedMethodUseRegistry.markAffected():161:161 -> i
     10:10:void registerFieldAccess(com.android.tools.r8.graph.DexField):235 -> i
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator -> com.android.tools.r8.internal.Y2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorOptimizationInfoPopulator -> com.android.tools.r8.internal.X2:
     java.util.function.BiConsumer interfaceDispatchOutsideProgram -> h
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -99551,7 +99180,7 @@
     181:189:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState lambda$getMethodStateAfterUninstantiatedParameterRemoval$1(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):255:263 -> a
     190:190:void com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState.<init>(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType):29:29 -> a
     190:190:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState lambda$getMethodStateAfterUninstantiatedParameterRemoval$1(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):263 -> a
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer -> com.android.tools.r8.internal.b3:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer -> com.android.tools.r8.internal.a3:
     java.util.Map interfaceDispatchOutsideProgram -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryVirtualMethods -> d
@@ -99578,7 +99207,7 @@
     44:53:com.android.tools.r8.utils.collections.DexMethodSignatureSet computeLibraryVirtualMethods(com.android.tools.r8.graph.DexClass):205:214 -> a
     54:54:void lambda$computeLibraryVirtualMethods$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClassAndMethod):213:213 -> a
     1:1:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo access$100(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer):81:81 -> b
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges -> com.android.tools.r8.internal.Z2:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges -> com.android.tools.r8.internal.Y2:
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges EMPTY -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet removableParameterIndices -> c
     boolean $assertionsDisabled -> e
@@ -99597,7 +99226,7 @@
     29:29:com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$AllowedPrototypeChanges empty():128:128 -> a
     1:7:boolean equals(java.lang.Object):138:144 -> equals
     1:1:int hashCode():133:133 -> hashCode
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer -> com.android.tools.r8.internal.a3:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer -> com.android.tools.r8.internal.Z2:
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer this$0 -> j
     java.util.Map allowedPrototypeChangesForVirtualMethods -> d
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -99800,14 +99429,14 @@
     448:448:void lambda$visitClass$11(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):591 -> a
     449:449:void lambda$visitClass$11(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):593:593 -> a
     450:457:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):796:803 -> a
-    458:458:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.withExtraParameters(com.android.tools.r8.ir.conversion.ExtraParameter[]):255:255 -> a
+    458:458:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.withExtraParameters(com.android.tools.r8.ir.conversion.ExtraParameter[]):263:263 -> a
     458:458:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):804 -> a
     459:471:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):805:817 -> a
     472:472:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):814:814 -> a
     473:473:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.synthesis.SyntheticItems.createClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.AppView):501:501 -> a
     473:473:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):814 -> a
     474:475:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):818:819 -> a
-    476:476:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.withExtraParameters(com.android.tools.r8.ir.conversion.ExtraParameter[]):255:255 -> a
+    476:476:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.proto.RewrittenPrototypeDescription.withExtraParameters(com.android.tools.r8.ir.conversion.ExtraParameter[]):263:263 -> a
     476:476:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):820 -> a
     477:479:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):821:823 -> a
     480:482:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription selectInitArgumentTypeForInstanceInitializer(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.utils.collections.DexMethodSignatureSet):822:824 -> a
@@ -99850,21 +99479,21 @@
     575:582:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1016:1023 -> a
     575:582:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
     583:583:com.android.tools.r8.graph.proto.RemovedReceiverInfo$Builder com.android.tools.r8.graph.proto.RemovedReceiverInfo$Builder.create():54:54 -> a
-    583:583:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1026 -> a
+    583:583:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1025 -> a
     583:583:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
-    584:584:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1026:1026 -> a
+    584:584:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1025:1025 -> a
     584:584:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
-    585:603:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1025:1043 -> a
-    585:603:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
-    604:620:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1039:1055 -> a
-    604:620:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
-    621:641:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1050:1070 -> a
-    621:641:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
-    642:651:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1064:1073 -> a
-    642:651:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
-    652:652:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1005:1005 -> a
-    653:664:com.android.tools.r8.graph.proto.RewrittenTypeInfo computeReturnChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1079:1090 -> a
-    665:665:void lambda$computeReturnChangesForMethod$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenTypeInfo$Builder):1086:1086 -> a
+    585:602:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1024:1041 -> a
+    585:602:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
+    603:619:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1037:1053 -> a
+    603:619:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
+    620:640:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1048:1068 -> a
+    620:640:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
+    641:650:com.android.tools.r8.graph.proto.ArgumentInfoCollection com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.computeParameterChangesForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.function.IntFunction,java.util.function.IntPredicate):1062:1071 -> a
+    641:650:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1008 -> a
+    651:651:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription computePrototypeChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,java.util.function.IntFunction,java.util.function.IntPredicate):1005:1005 -> a
+    652:663:com.android.tools.r8.graph.proto.RewrittenTypeInfo computeReturnChangesForMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1077:1088 -> a
+    664:664:void lambda$computeReturnChangesForMethod$18(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.proto.RewrittenTypeInfo$Builder):1084:1084 -> a
     boolean lambda$computePrototypeChangesForMethod$17(int) -> b
     1:22:void reservePinnedMethodSignatures(java.util.Set):296:317 -> b
     23:26:void lambda$reservePinnedMethodSignatures$1(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):302:305 -> b
@@ -99882,7 +99511,7 @@
     81:81:com.android.tools.r8.graph.DexType lambda$computePrototypeChangesForMethod$15(com.android.tools.r8.graph.ProgramMethod,int):893:893 -> b
     1:13:com.android.tools.r8.ir.analysis.value.SingleValue getReturnValue(com.android.tools.r8.graph.ProgramMethod):948:960 -> c
     1:2:boolean lambda$isReturnValueUnusedForVirtualMethods$8(com.android.tools.r8.graph.ProgramMethod):540:541 -> d
-com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods -> com.android.tools.r8.internal.d3:
+com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorUnoptimizableMethods -> com.android.tools.r8.internal.c3:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> b
@@ -99924,7 +99553,7 @@
     18:18:boolean com.android.tools.r8.graph.DexClass.isFinal():672:672 -> b
     18:18:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):46 -> b
     19:22:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47:50 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.F5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.E5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -99940,7 +99569,7 @@
     13:13: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.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):45 -> a
     14:15: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.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):47:48 -> 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.G5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState -> com.android.tools.r8.internal.F5:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState INSTANCE -> a
     1:3:void <clinit>():15:17 -> <clinit>
@@ -99956,7 +99585,7 @@
     16:16: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.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):50 -> a
     17:18: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.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):51:52 -> 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.I5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.H5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -99968,14 +99597,14 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> h
     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.J5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomParameterState -> com.android.tools.r8.internal.I5:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):17:17 -> a
     2:2:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):17 -> a
     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.N5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState -> com.android.tools.r8.internal.M5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():12:14 -> <clinit>
@@ -99988,7 +99617,7 @@
     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.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):38 -> 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.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):38:39 -> 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.O5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState -> com.android.tools.r8.internal.N5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -100004,7 +99633,7 @@
     13:13: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.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):45 -> a
     14:15: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.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):47:48 -> 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.Hc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState -> com.android.tools.r8.internal.Gc:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
@@ -100038,7 +99667,7 @@
     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.Kc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState -> com.android.tools.r8.internal.Jc:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
@@ -100077,7 +99706,7 @@
     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.Mc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.Lc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -100110,7 +99739,7 @@
     22:22: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,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):45:45 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState asConcrete() -> d
     boolean isConcrete() -> e
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.Mc:
     java.util.List parameterStates -> c
     boolean isReturnValueUsed -> b
     boolean $assertionsDisabled -> d
@@ -100225,10 +99854,10 @@
     1:1:boolean isEffectivelyUnknown():55:55 -> m
     1:1:boolean isReturnValueUsed():47:47 -> n
     1:1:int size():134:134 -> o
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.Oc:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Pc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Oc:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy() -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.Rc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.Qc:
     java.util.Set inParameters -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -100253,7 +99882,7 @@
     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.Sc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.Rc:
     java.util.Map receiverBoundsToState -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():19:19 -> <clinit>
@@ -100277,117 +99906,117 @@
     16:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():126 -> a
     17:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy():127:127 -> a
     18:18:void lambda$mutableCopy$0(java.util.Map,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):126:126 -> a
-    19:19: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165:165 -> a
+    19:19:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135:135 -> a
     20:20:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
-    20:20: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165 -> a
-    21:22: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165:166 -> a
-    23:23:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
-    23:23: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
-    24:24: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167 -> a
-    25:30: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167:172 -> a
-    31:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:55 -> a
-    31:31: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    32:32:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
-    32:32:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55 -> a
-    32:32: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    33:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:57 -> a
-    33:35: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    36:36:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    36:36:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):57 -> a
-    36:36: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    37:37:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):58:58 -> a
-    37:37: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    38:38:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
-    38:38:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):59 -> a
-    38:38: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    39:39:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:61 -> a
-    39:39: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    40:40:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
-    40:40:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65 -> a
-    40:40: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    41:44:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65:68 -> a
-    41:44: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    45:47:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):86:88 -> a
-    45:47:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    45:47: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    48:48:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    48:48:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
-    48:48:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    48:48: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    49:49:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88:88 -> a
-    49:49:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    49:49: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    20:20:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135 -> a
+    21:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135:149 -> a
+    36:38:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):86:88 -> a
+    36:38:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> a
+    39:39:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    39:39:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
+    39:39:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> a
+    40:40:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88:88 -> a
+    40:40:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> a
+    41:41:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    41:41:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
+    41:41:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> a
+    42:42:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91:91 -> a
+    42:42:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> a
+    43:43:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    43:43:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91 -> a
+    43:43:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> a
+    44:47:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91:94 -> a
+    44:47:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> a
+    48:48:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    48:48:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):89 -> a
+    48:48:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> a
+    49:49:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):150:150 -> a
     50:50:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    50:50:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
-    50:50:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    50:50: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    51:51:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
-    51:51:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91 -> a
-    51:51:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    51:51: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    52:55:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91:94 -> a
-    52:55:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    52:55: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
-    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):89 -> a
-    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
-    56:56: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    57:57:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):69:69 -> a
-    57:57: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    58:58:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    58:58:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):69 -> a
-    58:58: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    59:59:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
-    59:59:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):70 -> a
-    59:59: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    60:60:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):72:72 -> a
-    60:60: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
-    61:61:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
-    61:61: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):173 -> a
-    62:64: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):176:178 -> a
-    1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135:135 -> b
-    2:2:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> b
-    2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135 -> b
-    3:17:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):135:149 -> b
-    18:20:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):86:88 -> b
-    18:20:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> b
-    21:21:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> b
-    21:21:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> b
-    21:21:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> b
-    22:22:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88:88 -> b
-    22:22:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> b
-    23:23:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> b
-    23:23:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> b
-    23:23:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> b
-    24:24:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91:91 -> b
-    24:24:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> b
-    25:25:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> b
-    25:25:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91 -> b
-    25:25:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> b
-    26:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91:94 -> b
-    26:29:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> b
-    30:30:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> b
-    30:30:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):89 -> b
-    30:30:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):148 -> b
-    31:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):150:150 -> b
-    32:32:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> b
-    32:32:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):150 -> b
-    33:33:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> b
-    33:33:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):151 -> b
-    34:36:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):153:155 -> b
-    37:37:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.bottom():10:10 -> b
-    37:37:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):156 -> b
-    38:38:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):157:157 -> b
+    50:50:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):150 -> a
+    51:51:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    51:51:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):151 -> a
+    52:54:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):153:155 -> a
+    55:55:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.bottom():10:10 -> a
+    55:55:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):156 -> a
+    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopyWithRewrittenBounds(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):157:157 -> a
+    57:57: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165:165 -> a
+    58:58:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
+    58:58: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165 -> a
+    59:60: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):165:166 -> a
+    61:61:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
+    61:61: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    62:62:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
+    62:62: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167 -> a
+    63:68: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):167:172 -> a
+    69:69:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:55 -> a
+    69:69: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    70:70:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.isEffectivelyBottom():113:113 -> a
+    70:70:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55 -> a
+    70:70: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    71:73:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):55:57 -> a
+    71:73: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    74:74:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    74:74:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):57 -> a
+    74:74: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    75:75:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):58:58 -> a
+    75:75: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    76:76:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    76:76:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):59 -> a
+    76:76: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    77:77:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):61:61 -> a
+    77:77: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    78:78:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    78:78:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65 -> a
+    78:78: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    79:82:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):65:68 -> a
+    79:82: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    83:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):86:88 -> a
+    83:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    83:85: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    86:86:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    86:86:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
+    86:86:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    86:86: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    87:87:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88:88 -> a
+    87:87:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    87:87: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    88:88:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    88:88:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):88 -> a
+    88:88:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    88:88: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    89:89:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    89:89:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91 -> a
+    89:89:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    89:89: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    90:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):91:94 -> a
+    90:93:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    90:93: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.joinInner(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):89 -> a
+    94:94:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):67 -> a
+    94:94: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    95:95:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):69:69 -> a
+    95:95: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    96:96:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    96:96:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):69 -> a
+    96:96: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.unknown():14:14 -> a
+    97:97:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):70 -> a
+    97:97: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    98:98:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState.add(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):72:72 -> a
+    98:98: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):172 -> a
+    99:99:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isUnknown():0:0 -> a
+    99:99: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):173 -> a
+    100:102: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.ConcretePolymorphicMethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):176:178 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic() -> j
     1:1:boolean isEffectivelyBottom():113:113 -> k
     1:1:boolean isEffectivelyUnknown():117:117 -> l
     1:1:java.util.Collection values():183:183 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.Tc:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Uc:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.Wc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.Sc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.Tc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.Vc:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -100414,7 +100043,7 @@
     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.Xc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState -> com.android.tools.r8.internal.Wc:
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -100440,14 +100069,14 @@
     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.Zc:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState -> com.android.tools.r8.internal.Yc:
     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.KE:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.DE:
     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>
@@ -100456,21 +100085,21 @@
     1:5:boolean equals(java.lang.Object):30:34 -> equals
     1:1:int hashCode():39:39 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":90,"2":91,"3":92}}
-    90:90:java.lang.String toString():44:44 -> toString
-    91:91:java.lang.String toString():44:44 -> toString
-    92:92:java.lang.String toString():44:44 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
+    47:47:java.lang.String toString():44:44 -> toString
+    48:48:java.lang.String toString():44:44 -> toString
+    49:49:java.lang.String toString():44:44 -> toString
     45:45:java.lang.String toString():44:44 -> toString
     46:46:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":93,"2":94,"3":95}}
-    93:93:java.lang.String toString():44:44 -> toString
-    94:94:java.lang.String toString():44:44 -> toString
-    95:95:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.LE:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
+    47:47:java.lang.String toString():44:44 -> toString
+    48:48:java.lang.String toString():44:44 -> toString
+    49:49:java.lang.String toString():44:44 -> toString
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.EE:
     java.util.Map methodParameters -> a
     1:3:void <init>():12:14 -> <init>
     1:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter create(com.android.tools.r8.graph.ProgramMethod,int):17:17 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.SE:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.LE:
     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,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> 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,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
@@ -100483,7 +100112,7 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> 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.TE:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.ME:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic() -> b
     boolean isPolymorphic() -> c
@@ -100548,10 +100177,10 @@
     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):96:96 -> 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.uH:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState -> com.android.tools.r8.internal.kH:
     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.xL:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState -> com.android.tools.r8.internal.nL:
     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
@@ -100561,7 +100190,7 @@
     boolean isConcrete() -> d
     boolean isUnknown() -> e
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.aW:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.QV:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner CLONER -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner IDENTITY -> b
     1:14:void <clinit>():23:36 -> <clinit>
@@ -100570,15 +100199,15 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState) -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner getCloner():50:50 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner getIdentity():54:54 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.YV:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.OV:
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):27:27 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):32:32 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.ZV:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.PV:
     1:1:void <init>():37:37 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState) -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.F00:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.v00:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -100587,7 +100216,7 @@
     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,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> 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,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> 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.G00:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState -> com.android.tools.r8.internal.w00:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -100597,7 +100226,7 @@
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):25 -> 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.f20:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.V10:
     java.util.Set monomorphicVirtualMethods -> g
     java.util.Map virtualRootMethodsPerClass -> f
     java.util.Map virtualRootMethods -> h
@@ -100653,7 +100282,7 @@
     5:5:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157:157 -> l
     6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):276:276 -> l
     6:6:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157 -> l
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.e20:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.U10:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod parent -> a
     com.android.tools.r8.utils.collections.ProgramMethodSet overrides -> c
     com.android.tools.r8.graph.ProgramMethod root -> b
@@ -100672,7 +100301,7 @@
     13:13:com.android.tools.r8.graph.ProgramMethod getSingleNonAbstractMethod():84:84 -> c
     1:1:boolean hasOverrides():95:95 -> d
     1:1:boolean isInterfaceMethodWithSiblings():101:101 -> e
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter -> com.android.tools.r8.internal.KH:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter -> com.android.tools.r8.internal.AH:
     1:1:void <init>():32:32 -> <init>
     void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
     void processWorklist() -> a
@@ -100683,11 +100312,11 @@
     7:7:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):40:40 -> a
     8:8:boolean com.android.tools.r8.graph.GraphLens.isArgumentPropagatorGraphLens():0:0 -> a
     8:8:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):40 -> a
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$EmptyNullCheckInserter -> com.android.tools.r8.internal.IH:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$EmptyNullCheckInserter -> com.android.tools.r8.internal.yH:
     1:1:void <init>():208:208 -> <init>
     void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
     void processWorklist() -> a
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl -> com.android.tools.r8.internal.JH:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl -> com.android.tools.r8.internal.zH:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map worklist -> d
     boolean $assertionsDisabled -> e
@@ -100724,7 +100353,7 @@
     106:106:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
     106:106:void processWorklist():159 -> a
     107:113:void processWorklist():160:166 -> a
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator -> com.android.tools.r8.internal.Ro:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator -> com.android.tools.r8.internal.No:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
@@ -100733,26 +100362,26 @@
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):52:55 -> <init>
     1:12:void process(java.util.Set):75:86 -> a
     13:15:void lambda$process$0(java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):91:93 -> a
-    16:16:void lambda$propagate$1(java.util.function.Consumer,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):111:111 -> a
-    17:19:void postProcessMethodStates(java.util.concurrent.ExecutorService):122:122 -> a
-    20:20:void postProcessMethodStates(com.android.tools.r8.graph.DexProgramClass):127:127 -> a
-    21:25:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):131:135 -> a
-    26:26:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
-    26:26:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):135 -> a
-    27:30:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):135:138 -> a
-    31:31:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.bottom():15:15 -> a
-    31:31:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):138 -> a
-    32:34:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):138:140 -> a
-    35:35:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.unknown():19:19 -> a
-    35:35:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):140 -> a
-    36:36:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):140:140 -> a
+    16:25:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):101:110 -> a
+    26:30:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):108:112 -> a
+    31:31:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> a
+    31:31:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):112 -> a
+    32:36:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):113:117 -> a
+    37:37:void lambda$propagate$1(java.util.function.Consumer,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):111:111 -> a
+    38:40:void postProcessMethodStates(java.util.concurrent.ExecutorService):122:122 -> a
+    41:41:void postProcessMethodStates(com.android.tools.r8.graph.DexProgramClass):127:127 -> a
+    42:46:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):131:135 -> a
+    47:47:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isMonomorphic():0:0 -> a
+    47:47:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):135 -> a
+    48:51:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):135:138 -> a
+    52:52:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.bottom():15:15 -> a
+    52:52:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):138 -> a
+    53:55:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):138:140 -> a
+    56:56:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState.unknown():19:19 -> a
+    56:56:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):140 -> a
+    57:57:void postProcessMethodState(com.android.tools.r8.graph.ProgramMethod):140:140 -> a
     1:10:void run(java.util.concurrent.ExecutorService):61:70 -> b
-    11:20:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):101:110 -> b
-    21:25:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):108:112 -> b
-    26:26:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> b
-    26:26:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):112 -> b
-    27:31:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):113:117 -> b
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$FlowGraph -> com.android.tools.r8.internal.Po:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$FlowGraph -> com.android.tools.r8.internal.Lo:
     java.util.Map nodes -> a
     com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator this$0 -> b
     boolean $assertionsDisabled -> c
@@ -100827,7 +100456,7 @@
     76:79:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):249:252 -> a
     80:80:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):251:251 -> a
     81:82: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):256:257 -> a
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode -> com.android.tools.r8.internal.Qo:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode -> com.android.tools.r8.internal.Mo:
     java.util.Set predecessors -> d
     java.util.Set successors -> e
     com.android.tools.r8.graph.DexType parameterType -> c
@@ -100853,7 +100482,7 @@
     2:2:void setPending():346 -> g
     3:4:void setPending():346:347 -> g
     1:2:void unsetPending():355:356 -> h
-com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.It:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.Bt:
     boolean $assertionsDisabled -> i
     java.util.function.Consumer interfaceDispatchOutsideProgram -> h
     java.util.Map methodStatesToPropagate -> g
@@ -100867,35 +100496,35 @@
     20:20:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isPolymorphic():0:0 -> a
     20:20:void lambda$computeInterfaceState$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature,com.android.tools.r8.graph.ProgramMethod):115 -> a
     21:22:void lambda$computeInterfaceState$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature,com.android.tools.r8.graph.ProgramMethod):115:116 -> a
-    23:24:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):133:134 -> a
-    25:25:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexClass):784:784 -> a
-    25:25:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):134 -> a
-    26:34:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):135:143 -> a
-    35:35:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    35:35:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):143 -> a
-    36:50:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):144:158 -> a
-    51:84:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):166:199 -> a
-    85:115:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):175:205 -> a
-    116:116:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.getKey(com.android.tools.r8.graph.ProgramMethod):30:30 -> a
-    116:116:java.lang.Object com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.getKey(com.android.tools.r8.graph.ProgramMethod):14 -> a
-    116:116:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):96 -> a
-    116:116:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.get(com.android.tools.r8.graph.ProgramMethod):14 -> a
-    116:116:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):205 -> a
-    117:117:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):96:96 -> a
+    23:23:void propagateInterfaceStateToClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):127:127 -> a
+    24:25:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):133:134 -> a
+    26:26:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexClass):784:784 -> a
+    26:26:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):134 -> a
+    27:35:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):135:143 -> a
+    36:36:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    36:36:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):143 -> a
+    37:51:void lambda$propagateInterfaceStateToClassHierarchy$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):144:158 -> a
+    52:85:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):166:199 -> a
+    86:116:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):175:205 -> a
+    117:117:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.getKey(com.android.tools.r8.graph.ProgramMethod):30:30 -> a
+    117:117:java.lang.Object com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.getKey(com.android.tools.r8.graph.ProgramMethod):14 -> a
+    117:117:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):96 -> a
     117:117:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.get(com.android.tools.r8.graph.ProgramMethod):14 -> a
     117:117:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):205 -> a
-    118:118:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):205:205 -> a
-    119:119:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isPolymorphic():0:0 -> a
-    119:119:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):205 -> a
-    120:122:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):207:209 -> a
-    123:137:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):179:193 -> a
-    138:140:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):192:194 -> a
-    141:141:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):191:191 -> a
-    142:142:boolean lambda$transformInterfaceMethodStateForClassMethod$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):188:188 -> a
+    118:118:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):96:96 -> a
+    118:118:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.get(com.android.tools.r8.graph.ProgramMethod):14 -> a
+    118:118:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):205 -> a
+    119:119:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):205:205 -> a
+    120:120:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase.isPolymorphic():0:0 -> a
+    120:120:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):205 -> a
+    121:123:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState transformInterfaceMethodStateForClassMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):207:209 -> a
+    124:138:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):179:193 -> a
+    139:141:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):192:194 -> a
+    142:142:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound lambda$transformInterfaceMethodStateForClassMethod$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):191:191 -> a
+    143:143:boolean lambda$transformInterfaceMethodStateForClassMethod$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.lang.Boolean):188:188 -> a
     1:1:void lambda$propagateInterfaceStateToClassHierarchy$4(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature,com.android.tools.r8.graph.DexProgramClass):131:131 -> b
     2:5:boolean verifyAllInterfacesFinished(java.util.Collection):217:217 -> b
     1:1:boolean isRoot(com.android.tools.r8.graph.DexProgramClass):75:75 -> c
-    2:2:void propagateInterfaceStateToClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature):127:127 -> c
     1:1:void prune(com.android.tools.r8.graph.DexProgramClass):87:87 -> i
     1:3:void visit(com.android.tools.r8.graph.DexProgramClass):80:82 -> k
     1:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):93:94 -> l
@@ -100909,10 +100538,10 @@
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):104 -> l
     7:7:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):119:119 -> l
     1:1:boolean lambda$propagateInterfaceStateToClassHierarchy$2(com.android.tools.r8.graph.DexProgramClass):129:129 -> m
-com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.rE:
+com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.kE:
     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.R10:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.H10:
     boolean $assertionsDisabled -> h
     java.util.Map propagationStates -> g
     1:1:void <clinit>():34:34 -> <clinit>
@@ -101032,7 +100661,7 @@
     6:6:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):195 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):255:255 -> l
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.Q10:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.G10:
     java.util.Map activeUntilLowerBound -> b
     java.util.Map inactiveUntilUpperBound -> c
     com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator this$0 -> d
@@ -101068,7 +100697,7 @@
     1:1:void <init>():22:22 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType) -> a
     boolean shouldReprocessDueToDynamicType() -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection -> com.android.tools.r8.internal.c3:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection -> com.android.tools.r8.internal.b3:
     java.util.Map reproccessingCriteria -> b
     java.util.Map delayedReproccessingCriteria -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -101109,7 +100738,7 @@
     102:114:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):70:82 -> a
     115:115:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):81:81 -> a
     1:1:boolean verifyNoDelayedReprocessingCriteria():156:156 -> b
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.QE:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.JE:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap reproccesingCriteria -> a
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria ALWAYS_REPROCESS -> b
     boolean $assertionsDisabled -> c
@@ -101117,7 +100746,7 @@
     1:2:void <init>():23:24 -> <init>
     3:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):28:30 -> <init>
     1:3:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria getParameterReprocessingCriteria(int):38:38 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.BH:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.rH:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(boolean):26:27 -> <init>
@@ -101139,11 +100768,11 @@
     19:19:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):41:41 -> a
     20:20:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria.shouldReprocessPrimitiveParameter(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int):63:63 -> a
     20:20:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):42 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.wL:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.mL:
     1:1:void <init>():15:15 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType) -> a
     boolean shouldReprocessDueToDynamicType() -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.vL:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.lL:
     boolean reprocessDueToAbstractValue -> a
     boolean reprocessDueToDynamicType -> b
     boolean reprocessDueToNullability -> c
@@ -101156,7 +100785,7 @@
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToDynamicType():70:70 -> c
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToNullability():75:75 -> d
     1:1:boolean shouldAlwaysReprocess():80:80 -> e
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis -> com.android.tools.r8.internal.Jh:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis -> com.android.tools.r8.internal.Eh:
     java.util.Map constraints -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.collections.ProgramMethodSet optimizableVirtualMethods -> c
@@ -101196,7 +100825,7 @@
     84:88:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):112 -> a
     89:99:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):115:125 -> a
     100:102:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):221:223 -> a
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph -> com.android.tools.r8.internal.Kh:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph -> com.android.tools.r8.internal.Fh:
     java.util.Map nodes -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -101216,16 +100845,16 @@
     13:41:void com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph.addConstraintEdge(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Map):59:87 -> a
     13:41:void lambda$create$0(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph,java.util.Map,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,java.util.Set):46 -> a
     42:42:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode getOrCreateNode(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter,com.android.tools.r8.graph.ProgramMethod):102:102 -> a
-    43:53:void removeClosedCycles(java.util.function.Consumer):116:126 -> a
-    54:54:boolean com.android.tools.r8.utils.dfs.DFSWorklistItem.isFullyVisited():0:0 -> a
-    54:54:void removeClosedCycles(java.util.function.Consumer):127 -> a
-    55:59:void removeClosedCycles(java.util.function.Consumer):130:134 -> a
-    60:76:boolean lambda$removeClosedCycles$3(com.android.tools.r8.utils.dfs.DFSStack,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,java.util.function.Consumer,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):136:152 -> a
-    77:77:boolean lambda$removeClosedCycles$2(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):140:140 -> a
-    1:1:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode lambda$getOrCreateNode$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):103:103 -> b
-    2:7:void remove(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):107:112 -> b
+    43:43:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode lambda$getOrCreateNode$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):103:103 -> a
+    44:54:void removeClosedCycles(java.util.function.Consumer):116:126 -> a
+    55:55:boolean com.android.tools.r8.utils.dfs.DFSWorklistItem.isFullyVisited():0:0 -> a
+    55:55:void removeClosedCycles(java.util.function.Consumer):127 -> a
+    56:60:void removeClosedCycles(java.util.function.Consumer):130:134 -> a
+    61:77:boolean lambda$removeClosedCycles$3(com.android.tools.r8.utils.dfs.DFSStack,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode,java.util.function.Consumer,java.util.Deque,com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):136:152 -> a
+    78:78:boolean lambda$removeClosedCycles$2(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):140:140 -> a
+    1:6:void remove(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):107:112 -> b
     1:3:boolean verifyContains(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):161:163 -> c
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode -> com.android.tools.r8.internal.Lh:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode -> com.android.tools.r8.internal.Gh:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     boolean unoptimizable -> e
@@ -101256,14 +100885,14 @@
     1:1:void removeUnusedSuccessors():94:94 -> h
     1:1:void setUnoptimizable():106:106 -> i
     1:7:void setUnused():110:116 -> j
-com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.N4:
+com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.M4:
     1:1:void <init>():14:14 -> <init>
     void forEachNeighbor(java.lang.Object,java.util.function.Consumer) -> a
     void forEachNode(java.util.function.Consumer) -> a
     1:3:java.util.List computeStronglyConnectedComponents():25:27 -> a
     4:9:void lambda$computeStronglyConnectedComponents$0(java.util.Set,java.util.List,java.lang.Object):29:34 -> a
     10:15:java.util.Set computeStronglyConnectedComponent(java.lang.Object):40:45 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.kf:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.ff:
     java.util.Map states -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List newlySeenButNotFinishedRoots -> d
@@ -101314,12 +100943,12 @@
     16:18:void com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal.markFinished(com.android.tools.r8.graph.DexProgramClass):183:185 -> j
     16:18:void traverse(com.android.tools.r8.graph.DexProgramClass):129 -> j
     void visit(com.android.tools.r8.graph.DexProgramClass) -> k
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.jf:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.ef:
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState FINISHED -> c
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState SEEN -> 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.ParameterRemovalUtils -> com.android.tools.r8.internal.uL:
+com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils -> com.android.tools.r8.internal.kL:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:2:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):17:18 -> a
@@ -101330,7 +100959,7 @@
     4:6:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):19 -> a
     7:10:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):22:25 -> a
     11:22:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):30:41 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.MM:
+com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.CM:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):20:22 -> <init>
@@ -101347,7 +100976,7 @@
     5:5:void com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph.forEachNeighbor(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):28:28 -> a
     5:5:void forEachNeighbor(java.lang.Object,java.util.function.Consumer):13 -> a
     6:6:void forEachNode(java.util.function.Consumer):33:33 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.r20:
+com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.h20:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <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):28:29 -> a
@@ -101396,7 +101025,7 @@
     51:51:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:101 -> a
     51:51:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(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):82 -> a
     52:52:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(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):82:82 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.U5:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.T5:
     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
@@ -101409,81 +101038,81 @@
     3:26:void run():88:111 -> a
     27:27:void lambda$run$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):90:90 -> a
     28:30:void lambda$run$1(com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):113:115 -> a
-    31:80:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):157:206 -> a
-    81:83:java.util.Map$Entry com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findMostFrequentBridge(java.util.Map):268:270 -> a
-    81:83:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):209 -> a
-    84:86:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):210:212 -> a
-    87:94:java.util.List com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getBridgesEligibleForHoisting(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):279:286 -> a
-    87:94:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):216 -> a
-    95:95:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):217:217 -> a
-    96:99:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):292:295 -> a
-    96:99:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):220 -> a
-    100:100:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> a
-    100:100:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):295 -> a
+    31:38:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):124:131 -> a
+    39:45:java.util.Set com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getCandidatesForHoisting(java.util.Set):139:145 -> a
+    39:45:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):133 -> a
+    46:47:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):133:134 -> a
+    48:97:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):157:206 -> a
+    98:100:java.util.Map$Entry com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findMostFrequentBridge(java.util.Map):268:270 -> a
+    98:100:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):209 -> a
+    101:103:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):210:212 -> a
+    104:111:java.util.List com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getBridgesEligibleForHoisting(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):279:286 -> a
+    104:111:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):216 -> a
+    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():443:443 -> 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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    100:100:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):220 -> a
-    101:101:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> a
-    101:101:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):295 -> a
-    101:101:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):220 -> a
-    102:114:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):226:238 -> a
-    115:117: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):299:301 -> a
-    115:117:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    118:139:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):310:331 -> a
-    118:139: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):301 -> a
-    118:139:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    140:140:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
-    140:140:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):331 -> a
-    140:140: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):301 -> a
-    140:140:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    141:141:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    141:141:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
-    141:141:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):331 -> a
-    141:141: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):301 -> a
-    141:141:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    142:142:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    142:142:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
-    142:142:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):331 -> a
-    142:142: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):301 -> a
-    142:142:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    143:144: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):303:304 -> a
-    143:144:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    145:149:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):336:340 -> a
-    145:149: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):304 -> a
-    145:149:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    150:150:boolean com.android.tools.r8.code.Instruction.isInvokeVirtual():0:0 -> a
-    150:150:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):340 -> a
-    150:150: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):304 -> a
-    150:150:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    151:157:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):341:347 -> a
-    151:157: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):304 -> a
-    151:157:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    158:158:boolean com.android.tools.r8.code.Instruction.isInvokeVirtualRange():0:0 -> a
-    158:158:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):349 -> a
-    158:158: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):304 -> a
+    117:117:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):220 -> a
+    118:118:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> a
+    118:118:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):295 -> a
+    118:118:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):220 -> a
+    119:131:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):226:238 -> a
+    132:134: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):299:301 -> a
+    132:134:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    135:156:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):310:331 -> a
+    135:156: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):301 -> a
+    135:156:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    157:157:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
+    157:157:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):331 -> a
+    157:157: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):301 -> a
+    157:157:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    158:158:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    158:158:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
+    158:158:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):331 -> a
+    158:158: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):301 -> a
     158:158:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    159:178:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):350:369 -> a
-    159:178: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):304 -> a
-    159:178:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    179:194:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239:254 -> a
-    195:204:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):251:260 -> a
-    205:205: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
-    205:205:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    206:206:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":208,"2":209,"3":210}}
-    208:208: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
-    208:208:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    209:209: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
-    209:209:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    210:210: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
-    210:210:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    207:207: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
-    207:207:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
-    211:211:java.util.List lambda$hoistBridgeIfPossible$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):201:201 -> a
-    1:8:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):124:131 -> b
-    9:15:java.util.Set com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getCandidatesForHoisting(java.util.Set):139:145 -> b
-    9:15:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):133 -> b
-    16:17:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):133:134 -> b
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.V5:
+    159:159:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    159:159:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
+    159:159:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):331 -> a
+    159:159: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):301 -> a
+    159:159:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    160:161: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):303:304 -> a
+    160:161:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    162:166:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):336:340 -> a
+    162:166: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):304 -> a
+    162:166:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    167:167:boolean com.android.tools.r8.code.Instruction.isInvokeVirtual():0:0 -> a
+    167:167:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):340 -> a
+    167:167: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):304 -> a
+    167:167:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    168:174:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):341:347 -> a
+    168:174: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):304 -> a
+    168:174:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    175:175:boolean com.android.tools.r8.code.Instruction.isInvokeVirtualRange():0:0 -> a
+    175:175:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):349 -> a
+    175:175: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):304 -> a
+    175:175:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    176:195:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):350:369 -> a
+    176:195: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):304 -> a
+    176:195:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    196:211:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239:254 -> a
+    212:221:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):251:260 -> a
+    222:222: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
+    222:222:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    223:223:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":225,"2":226,"3":227}}
+    225:225: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
+    225:225:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    226:226: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
+    226:226:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    227:227: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
+    227:227:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    224:224: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
+    224:224:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):239 -> a
+    228:228: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.U5:
     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
@@ -101498,12 +101127,12 @@
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens.getNextMethodSignature(com.android.tools.r8.graph.DexMethod):43:43 -> b
     2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):32 -> b
     3:3:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):53:53 -> b
+    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):73:75 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):73:75 -> d
     1:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):37:38 -> e
     3:3:boolean hasCodeRewritings():85:85 -> e
     1:1:boolean isContextFreeForMethods():80:80 -> g
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.W5:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.V5:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap bridgeToHoistedBridgeMap -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -101529,184 +101158,172 @@
     35:36:com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens buildLens():86:87 -> a
     1:1:boolean isEmpty():44:44 -> b
     2:2:void lambda$recordNonReboundMethodAccesses$2(com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):80:80 -> b
-com.android.tools.r8.optimize.proto.ProtoNormalizer -> com.android.tools.r8.internal.jP:
+com.android.tools.r8.optimize.proto.ProtoNormalizer -> com.android.tools.r8.internal.ZO:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():44:44 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):50:53 -> <init>
-    1:1:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57:57 -> a
-    2:2:void com.android.tools.r8.utils.Timing.time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):379:379 -> a
-    2:2:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):48:51 -> <init>
+    1:2:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):55:56 -> a
+    3:3:void com.android.tools.r8.utils.Timing.time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):379:379 -> a
+    3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:6:void com.android.tools.r8.utils.Timing.time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):381:383 -> a
-    4:6:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57 -> a
-    7:16:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):76:85 -> a
-    17:17:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):66 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):85 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):70:70 -> a
+    5:7:void com.android.tools.r8.utils.Timing.time(java.lang.String,com.android.tools.r8.utils.ThrowingAction):381:383 -> a
+    5:7:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):56 -> a
+    8:17:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):76:85 -> a
+    18:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
     18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):66 -> a
     18:18:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):85 -> a
-    19:25:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):87:93 -> a
-    26:29:void lambda$run$1(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):96:99 -> a
-    30:77:com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState computeGlobalReservationState(java.util.concurrent.ExecutorService):115:162 -> a
-    78:93:void lambda$computeGlobalReservationState$4(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexTypeList,java.util.Set):137:152 -> a
-    94:95:void com.android.tools.r8.optimize.proto.ProtoNormalizer.computeExtraReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet):193:194 -> a
-    94:95:void lambda$computeGlobalReservationState$5(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):158 -> a
-    96:96:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$8(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):218:218 -> a
-    97:98:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):226:227 -> a
-    99:99:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):266:266 -> a
-    99:99:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):227 -> a
-    100:100:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):266:266 -> a
-    100:100:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):227 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):70:70 -> a
+    19:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):66 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):85 -> a
+    20:26:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):87:93 -> a
+    27:30:void lambda$run$1(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):96:99 -> a
+    31:78:com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState computeGlobalReservationState(java.util.concurrent.ExecutorService):115:162 -> a
+    79:79:void lambda$computeGlobalReservationState$3(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):128:128 -> a
+    80:95:void lambda$computeGlobalReservationState$4(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexTypeList,java.util.Set):137:152 -> a
+    96:97:void com.android.tools.r8.optimize.proto.ProtoNormalizer.computeExtraReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet):193:194 -> a
+    96:97:void lambda$computeGlobalReservationState$5(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):158 -> a
+    98:98:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$8(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):218:218 -> a
+    99:100:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):226:227 -> a
+    101:101:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):266:266 -> a
+    101:101:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):227 -> a
+    102:102:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):266:266 -> a
+    102:102:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    101:107:void lambda$computeInstanceInitializerCollisions$9(com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,java.util.Map,com.android.tools.r8.graph.ProgramMethod):229:235 -> a
-    108:126:void resolveInstanceInitializerCollisions(java.util.Map):242:260 -> a
-    127:128:java.lang.Object com.android.tools.r8.utils.IterableUtils.min(java.lang.Iterable,java.util.Comparator):101:102 -> a
-    127:128:void resolveInstanceInitializerCollisions(java.util.Map):260 -> a
-    129:136:void resolveInstanceInitializerCollisions(java.util.Map):260:267 -> a
-    137:149:void resolveInstanceInitializerCollisions(java.util.Map):266:278 -> a
-    150:151:void lambda$resolveInstanceInitializerCollisions$10(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):245:246 -> a
-    152:166:boolean com.android.tools.r8.optimize.proto.ProtoNormalizer.isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):283:297 -> a
-    152:166:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):170 -> a
-    167:167:boolean com.android.tools.r8.optimize.proto.ProtoNormalizer.isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):296:296 -> a
-    167:167:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):170 -> a
-    168:168:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):175:175 -> a
-    169:169:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:162 -> a
-    169:169:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):175 -> a
+    103:109:void lambda$computeInstanceInitializerCollisions$9(com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,java.util.Map,com.android.tools.r8.graph.ProgramMethod):229:235 -> a
+    110:128:void resolveInstanceInitializerCollisions(java.util.Map):242:260 -> a
+    129:130:java.lang.Object com.android.tools.r8.utils.IterableUtils.min(java.lang.Iterable,java.util.Comparator):101:102 -> a
+    129:130:void resolveInstanceInitializerCollisions(java.util.Map):260 -> a
+    131:138:void resolveInstanceInitializerCollisions(java.util.Map):260:267 -> a
+    139:151:void resolveInstanceInitializerCollisions(java.util.Map):266:278 -> a
+    152:153:void lambda$resolveInstanceInitializerCollisions$10(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):245:246 -> a
+    154:155:boolean com.android.tools.r8.optimize.proto.ProtoNormalizer.isUnoptimizable(com.android.tools.r8.graph.ProgramMethod):284:285 -> a
+    154:155:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):170 -> a
+    156:156:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):175:175 -> a
+    157:157:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:162 -> a
+    157:157:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):175 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    170:176:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> a
-    170:176:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):175 -> a
-    177:177:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):175:175 -> a
-    178:183:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):174:179 -> a
-    184:184:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexClassAndMethod):66:66 -> a
-    184:184:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):179 -> a
-    185:185:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):184:184 -> a
-    186:186:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:162 -> a
-    186:186:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):184 -> a
+    158:164:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> a
+    158:164:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):175 -> a
+    165:165:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):175:175 -> a
+    166:171:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):174:179 -> a
+    172:172:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexClassAndMethod):66:66 -> a
+    172:172:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):179 -> a
+    173:173:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):184:184 -> a
+    174:174:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:162 -> a
+    174:174:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    187:193:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> a
-    187:193:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):184 -> a
-    194:194:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):184:184 -> a
-    195:197:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):183:185 -> a
-    198:198:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):779:779 -> a
-    198:198:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):215 -> a
-    199:199:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):845:845 -> a
-    199:199:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):779 -> a
-    199:199:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):215 -> a
-    200:200:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):215:215 -> a
+    175:181:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> a
+    175:181:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):184 -> a
+    182:182:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):184:184 -> a
+    183:185:void computeReservationsFromMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet) -> a
+    186:186:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):779:779 -> a
+    186:186:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):215 -> a
+    187:187:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.getNext(java.util.Iterator,java.lang.Object):845:845 -> a
+    187:187:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getFirst(java.lang.Iterable,java.lang.Object):779 -> a
+    187:187:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):215 -> a
+    188:188:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$6(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet):215:215 -> a
     com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$7(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.DexMethodSignatureSet) -> b
-    1:1:void lambda$run$0(java.util.concurrent.ExecutorService):57:57 -> b
-    2:2:void lambda$computeGlobalReservationState$3(java.util.Map,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):128:128 -> b
-    3:10:java.util.Map computeNewInstanceInitializerSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):205:212 -> b
+    1:1:void lambda$run$0(java.util.concurrent.ExecutorService):56:56 -> b
+    2:9:java.util.Map computeNewInstanceInitializerSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):205:212 -> b
     1:7:void run(java.util.concurrent.ExecutorService):61:67 -> c
     8:8:com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens.builder(com.android.tools.r8.graph.AppView):40:40 -> c
     8:8:void run(java.util.concurrent.ExecutorService):67 -> c
     9:47:void run(java.util.concurrent.ExecutorService):68:106 -> c
-com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState -> com.android.tools.r8.internal.hP:
+com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState -> com.android.tools.r8.internal.XO:
     java.util.Map reservedParameters -> a
     com.android.tools.r8.utils.collections.DexMethodSignatureSet unoptimizableSignatures -> b
-    1:3:void <init>(java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):315:317 -> <init>
+    1:3:void <init>(java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):300:302 -> <init>
     1:1:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethodSignature.getParameters():37:37 -> a
-    1:1:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):339 -> a
+    1:1:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):324 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
     2:2:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethodSignature.getParameters():37 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):339 -> a
+    2:2:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):324 -> a
     3:3:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:162 -> a
-    3:3:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):339 -> a
+    3:3:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):324 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:10:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> a
-    4:10:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):339 -> a
-    11:11:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):340:340 -> a
-    12:13:java.util.Map selectDeterministicTarget(java.util.Map):322:323 -> a
-    14:22:void lambda$selectDeterministicTarget$0(java.util.Map,com.android.tools.r8.graph.DexTypeList,java.util.Set):325:333 -> a
-com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState -> com.android.tools.r8.internal.iP:
+    4:10:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):324 -> a
+    11:11:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):325:325 -> a
+    12:13:java.util.Map selectDeterministicTarget(java.util.Map):307:308 -> a
+    14:22:void lambda$selectDeterministicTarget$0(java.util.Map,com.android.tools.r8.graph.DexTypeList,java.util.Set):310:318 -> a
+com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState -> com.android.tools.r8.internal.YO:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():348:348 -> <clinit>
-    1:3:void <init>():348:350 -> <init>
-    1:1:boolean com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState.isUnoptimizable(com.android.tools.r8.graph.DexMethodSignature):344:344 -> a
-    1:1:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):374 -> a
+    1:1:void <clinit>():333:333 -> <clinit>
+    1:3:void <init>():333:335 -> <init>
+    1:1:boolean com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState.isUnoptimizable(com.android.tools.r8.graph.DexMethodSignature):329:329 -> a
+    1:1:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):359 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:boolean com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState.isUnoptimizable(com.android.tools.r8.graph.DexMethodSignature):344:344 -> a
-    2:2:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):374 -> a
-    3:8:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):375:380 -> a
+    2:2:boolean com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState.isUnoptimizable(com.android.tools.r8.graph.DexMethodSignature):329:329 -> a
+    2:2:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):359 -> a
+    3:8:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):360:365 -> a
     9:9:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethodSignature.getParameters():37:37 -> a
-    9:9:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):381 -> a
+    9:9:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):366 -> a
     10:10:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
     10:10:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethodSignature.getParameters():37 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):381 -> a
-    11:11:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):382:382 -> a
-    12:31:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):380:399 -> a
-    32:32:com.android.tools.r8.graph.DexMethodSignature getAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):365:365 -> a
-    1:1:com.android.tools.r8.graph.DexMethodSignature getNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):357:357 -> b
-com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens -> com.android.tools.r8.internal.lP:
+    10:10:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):366 -> a
+    11:11:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):367:367 -> a
+    12:30:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):365:383 -> a
+    31:31:com.android.tools.r8.graph.DexMethodSignature getAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):350:350 -> a
+    1:1:com.android.tools.r8.graph.DexMethodSignature getNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):342:342 -> b
+com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens -> com.android.tools.r8.internal.bP:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.collections.BidirectionalOneToOneMap newMethodSignatures -> f
     java.util.Map prototypeChanges -> g
     1:1:void <clinit>():25:25 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap,java.util.Map):34:36 -> <init>
+    com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):45:45 -> a
     2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):55:55 -> a
-    3:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):63:63 -> a
-    4:4:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
-    4:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):63 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):103:103 -> a
-    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens.getNextMethodSignature(com.android.tools.r8.graph.DexMethod):133:133 -> a
-    6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):104 -> a
-    7:14:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):108:115 -> a
-    15:15:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):114:114 -> a
-    16:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):113:113 -> a
-    17:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):110:118 -> a
+    3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):100:100 -> a
+    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> a
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):101 -> a
+    5:8:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):105:108 -> a
+    9:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):107:111 -> a
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):50:50 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):71:71 -> b
-    3:3:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> b
-    3:3:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):71 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):68:68 -> b
+    1:5:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):75:79 -> c
+    6:6:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.GraphLens.lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):461:461 -> c
+    6:6:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):79 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens.getNextMethodSignature(com.android.tools.r8.graph.DexMethod):133:133 -> b
-    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):71 -> b
+    7:9:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):83:83 -> c
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> d
-    1:5:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):78:82 -> d
-    6:6:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.graph.GraphLens.lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):461:461 -> d
-    6:6:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):82 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:9:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):86:86 -> d
-    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):128:128 -> e
+    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):121:121 -> e
     2:2:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap.getRepresentativeKeyOrDefault(java.lang.Object,java.lang.Object):22:22 -> e
-    2:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):128 -> e
+    2:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):121 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):128:128 -> e
-    1:1:boolean isContextFreeForMethods():92:92 -> g
-com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder -> com.android.tools.r8.internal.kP:
+    3:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):121:121 -> e
+    1:1:boolean isContextFreeForMethods():89:89 -> g
+com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder -> com.android.tools.r8.internal.aP:
     java.util.Map prototypeChanges -> 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>():136:136 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$1):136:136 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView):144:144 -> <init>
-    3:9:void <init>(com.android.tools.r8.graph.AppView):139:145 -> <init>
-    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):150:152 -> a
-    4:18:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):164:178 -> a
-    4:18:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):154 -> a
-    19:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):177:187 -> a
-    19:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):154 -> a
+    1:1:void <clinit>():129:129 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$1):129:129 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView):137:137 -> <init>
+    3:9:void <init>(com.android.tools.r8.graph.AppView):132:138 -> <init>
+    1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):143:145 -> a
+    4:18:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):157:171 -> a
+    4:18:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147 -> a
+    19:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):170:180 -> a
+    19:29:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147 -> a
     30:30:boolean com.android.tools.r8.graph.proto.ArgumentPermutation.isDefault():0:0 -> a
-    30:30:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):187 -> a
-    30:30:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):154 -> a
-    31:37:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):187:193 -> a
-    31:37:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):154 -> a
-    38:41:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):155:158 -> a
-    42:42:com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens build():201:201 -> a
-    1:1:boolean isEmpty():197:197 -> b
+    30:30:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):180 -> a
+    30:30:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147 -> a
+    31:37:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder.computePrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):180:186 -> a
+    31:37:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147 -> a
+    38:41:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription recordNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):148:151 -> a
+    42:42:com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens build():194:194 -> a
+    1:1:boolean isEmpty():190:190 -> b
 com.android.tools.r8.org.objectweb.asm.AnnotationVisitor -> com.android.tools.r8.internal.c2:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor av -> a
     1:1:void <init>(int):59:59 -> <init>
@@ -101748,7 +101365,7 @@
     178:178:void putAnnotations(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.ByteVector):468:468 -> a
     179:202: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.X3:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.W3:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -101757,7 +101374,7 @@
     4:4:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
     5:18:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int):247:260 -> a
     19:29: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.W3:
+com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.V3:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -101767,7 +101384,7 @@
     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.g6:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.f6:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -101787,7 +101404,7 @@
     1:9:com.android.tools.r8.org.objectweb.asm.ByteVector put12(int,int):130:138 -> c
     10:19: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.Ka:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.Ja:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     int[] cpInfoOffsets -> c
@@ -102109,7 +101726,7 @@
     1:2:long readLong(int):3634:3635 -> e
     1:2:short readShort(int):3607:3608 -> f
     1:2:int readUnsignedShort(int):3595:3596 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.Ta:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.Sa:
     java.lang.String className -> b
     int constantPoolCount -> c
     1:1:void <init>(java.lang.String,int):0:0 -> <init>
@@ -102122,7 +101739,7 @@
     50:52: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.Xa:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.Wa:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):58:58 -> <init>
@@ -102148,7 +101765,7 @@
     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.gb:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.fb:
 # {"id":"sourceFile","fileName":"ClassWriter.java"}
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
@@ -102218,7 +101835,7 @@
     307:307:byte[] toByteArray():720:720 -> b
     308:308: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.sd:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.rd:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -102233,7 +101850,7 @@
     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.yd:
+com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.xd:
 # {"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
@@ -102245,7 +101862,7 @@
     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.Sd:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.Rd:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -102266,15 +101883,15 @@
     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.Wd:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.Vd:
     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.Ih:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.Dh:
     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.jk:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.ek:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -102292,7 +101909,7 @@
     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.kk:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.fk:
     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
@@ -102321,7 +101938,7 @@
     15:21:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:225 -> b
     15:21:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable):191 -> b
     15:21:int computeFieldInfoSize():208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.bl:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.Wk:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -102431,7 +102048,7 @@
     1:11:void setLocal(int,int):504:514 -> b
     12:27:void push(int):524:539 -> b
     28:32:int pop():567:571 -> b
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.km:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.fm:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -102446,7 +102063,7 @@
     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.lm:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.gm:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -102466,7 +102083,7 @@
     26:27: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
     28:29: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
     28:29: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):148 -> a
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.uA:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.nA:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
     int bytecodeOffset -> e
@@ -102503,7 +102120,7 @@
     623:623:java.lang.String toString():620:620 -> toString
     624:624:java.lang.String toString():620:620 -> toString
     621:621:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.UE:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.NE:
     int codeSize -> e
     java.lang.String methodName -> c
     java.lang.String className -> b
@@ -102513,7 +102130,7 @@
     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.VE:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.OE:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -102533,26 +102150,27 @@
     9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):224:225 -> a
     11:12:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):299:300 -> a
     13:14:void visitInsn(int):323:324 -> a
-    15:16:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):390:391 -> a
-    17:17:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):430:430 -> a
-    18:18:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):410:410 -> a
-    18:18:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):434 -> a
-    19:25:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):432:438 -> a
-    26:30:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):458:462 -> a
-    31:31:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):459:459 -> a
-    32:33:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):477:478 -> a
-    34:35:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):488:489 -> a
-    36:45:void visitLdcInsn(java.lang.Object):541:550 -> a
-    46:47:void visitIincInsn(int,int):561:562 -> a
-    48:49:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):577:578 -> a
-    50:51:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):591:592 -> a
-    52:53:void visitMultiANewArrayInsn(java.lang.String,int):603:604 -> a
-    54:58:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):629:633 -> a
-    59:59:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):630:630 -> a
-    60:61:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):655:656 -> a
-    62:63:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):707:708 -> a
-    64:68: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):740:744 -> a
-    69:69: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):741:741 -> a
+    15:16:void visitTypeInsn(int,java.lang.String):373:374 -> a
+    17:18:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):390:391 -> a
+    19:19:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):430:430 -> a
+    20:20:void com.android.tools.r8.org.objectweb.asm.MethodVisitor.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):410:410 -> a
+    20:20:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):434 -> a
+    21:27:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):432:438 -> a
+    28:32:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):458:462 -> a
+    33:33:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):459:459 -> a
+    34:35:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):477:478 -> a
+    36:37:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):488:489 -> a
+    38:47:void visitLdcInsn(java.lang.Object):541:550 -> a
+    48:49:void visitIincInsn(int,int):561:562 -> a
+    50:51:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):577:578 -> a
+    52:53:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):591:592 -> a
+    54:55:void visitMultiANewArrayInsn(java.lang.String,int):603:604 -> a
+    56:60:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):629:633 -> a
+    61:61:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):630:630 -> a
+    62:63:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):655:656 -> a
+    64:65:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):707:708 -> a
+    66:70: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):740:744 -> a
+    71:71: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):741:741 -> a
     1:5:void visitParameter(java.lang.String,int):111:115 -> b
     6:6:void visitParameter(java.lang.String,int):112:112 -> b
     7:8:void visitCode():231:232 -> b
@@ -102562,11 +102180,10 @@
     17:18:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):760:761 -> b
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):167:171 -> c
     6:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):168:168 -> c
-    7:8:void visitTypeInsn(int,java.lang.String):373:374 -> c
-    9:10:void visitMaxs(int,int):772:773 -> c
-    11:12:void visitEnd():782:783 -> c
+    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.WE:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.PE:
     boolean hasSubroutines -> d0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> I
     int nameIndex -> l
@@ -102636,65 +102253,67 @@
     208:208:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):779:779 -> a
     209:221:void visitInsn(int):862:874 -> a
     222:231:void visitInsn(int):868:877 -> a
-    232:255:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):992:1015 -> a
-    256:256:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1011:1011 -> a
-    257:257:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1008:1008 -> a
-    258:274:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1005:1021 -> a
-    275:275:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):999:999 -> a
-    276:280:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1033:1037 -> a
-    281:284:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
-    281:284:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1038 -> a
-    285:291:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1038:1044 -> a
-    292:295:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
-    292:295:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1047 -> a
-    296:303:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1051:1058 -> a
-    304:304:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1045:1045 -> a
-    305:314:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1069:1078 -> a
-    315:318:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
-    315:318:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1081 -> a
-    319:323:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1083:1087 -> a
-    324:324:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1079:1079 -> a
-    325:424:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):1094:1193 -> a
-    425:495:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):1201:1271 -> a
-    496:523:void visitLdcInsn(java.lang.Object):1277:1304 -> a
-    524:524:void visitLdcInsn(java.lang.Object):1298:1298 -> a
-    525:530:void visitIincInsn(int,int):1311:1316 -> a
-    531:543:void visitIincInsn(int,int):1314:1326 -> a
-    544:553:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1334:1343 -> a
-    554:564:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1348:1358 -> a
-    565:585:void visitSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1362:1382 -> a
-    586:597:void visitMultiANewArrayInsn(java.lang.String,int):1388:1399 -> a
-    598:598:void visitMultiANewArrayInsn(java.lang.String,int):1395:1395 -> a
-    599:608:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1408:1417 -> a
-    609:617:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1429:1437 -> a
-    618:643:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1463:1488 -> a
-    644:664: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):1504:1524 -> a
-    665:670:int visitFrameStart(int,int,int):1821:1826 -> a
-    671:689:boolean canCopyMethodAttributes(com.android.tools.r8.org.objectweb.asm.ClassReader,boolean,boolean,int,int,int):2026:2044 -> a
-    690:739:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2181:2230 -> a
-    740:740:int com.android.tools.r8.org.objectweb.asm.Attribute.getAttributeCount():172:172 -> a
-    740:740:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2231 -> a
-    741:745:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2234:2238 -> a
-    746:746:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> a
-    746:746:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableSize(com.android.tools.r8.org.objectweb.asm.Handler):176 -> a
-    746:746:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2238 -> a
-    747:792:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2240:2285 -> a
-    793:793:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> a
-    793:793:void com.android.tools.r8.org.objectweb.asm.Handler.putExceptionTable(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.ByteVector):187 -> a
-    793:793:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2285 -> a
-    794:802:void com.android.tools.r8.org.objectweb.asm.Handler.putExceptionTable(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.ByteVector):187:195 -> a
-    794:802:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2285 -> a
-    803:809:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2286:2292 -> a
-    810:810:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2291:2291 -> a
-    811:841:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2290:2320 -> a
-    842:847:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2319:2324 -> a
-    848:878:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2323:2353 -> a
-    879:892:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2349:2362 -> a
-    893:915:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2358:2380 -> a
-    916:924:void com.android.tools.r8.org.objectweb.asm.Attribute.putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):307:315 -> a
-    916:924:void com.android.tools.r8.org.objectweb.asm.Attribute.putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):279 -> a
-    916:924:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2380 -> a
-    925:926:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):2390:2391 -> a
+    232:246:void visitTypeInsn(int,java.lang.String):970:984 -> a
+    247:247:void visitTypeInsn(int,java.lang.String):977:977 -> a
+    248:271:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):992:1015 -> a
+    272:272:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1011:1011 -> a
+    273:273:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1008:1008 -> a
+    274:290:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):1005:1021 -> a
+    291:291:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):999:999 -> a
+    292:296:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1033:1037 -> a
+    297:300:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
+    297:300:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1038 -> a
+    301:307:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1038:1044 -> a
+    308:311:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
+    308:311:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1047 -> a
+    312:319:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1051:1058 -> a
+    320:320:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):1045:1045 -> a
+    321:330:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1069:1078 -> a
+    331:334:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
+    331:334:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1081 -> a
+    335:339:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1083:1087 -> a
+    340:340:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):1079:1079 -> a
+    341:440:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):1094:1193 -> a
+    441:511:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):1201:1271 -> a
+    512:539:void visitLdcInsn(java.lang.Object):1277:1304 -> a
+    540:540:void visitLdcInsn(java.lang.Object):1298:1298 -> a
+    541:546:void visitIincInsn(int,int):1311:1316 -> a
+    547:559:void visitIincInsn(int,int):1314:1326 -> a
+    560:569:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1334:1343 -> a
+    570:580:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1348:1358 -> a
+    581:601:void visitSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1362:1382 -> a
+    602:613:void visitMultiANewArrayInsn(java.lang.String,int):1388:1399 -> a
+    614:614:void visitMultiANewArrayInsn(java.lang.String,int):1395:1395 -> a
+    615:624:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1408:1417 -> a
+    625:633:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1429:1437 -> a
+    634:659:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1463:1488 -> a
+    660:680: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):1504:1524 -> a
+    681:686:int visitFrameStart(int,int,int):1821:1826 -> a
+    687:705:boolean canCopyMethodAttributes(com.android.tools.r8.org.objectweb.asm.ClassReader,boolean,boolean,int,int,int):2026:2044 -> a
+    706:755:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2181:2230 -> a
+    756:756:int com.android.tools.r8.org.objectweb.asm.Attribute.getAttributeCount():172:172 -> a
+    756:756:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2231 -> a
+    757:761:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2234:2238 -> a
+    762:762:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> a
+    762:762:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableSize(com.android.tools.r8.org.objectweb.asm.Handler):176 -> a
+    762:762:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2238 -> a
+    763:808:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2240:2285 -> a
+    809:809:int com.android.tools.r8.org.objectweb.asm.Handler.getExceptionTableLength(com.android.tools.r8.org.objectweb.asm.Handler):163:163 -> a
+    809:809:void com.android.tools.r8.org.objectweb.asm.Handler.putExceptionTable(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.ByteVector):187 -> a
+    809:809:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2285 -> a
+    810:818:void com.android.tools.r8.org.objectweb.asm.Handler.putExceptionTable(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.ByteVector):187:195 -> a
+    810:818:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2285 -> a
+    819:825:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2286:2292 -> a
+    826:826:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2291:2291 -> a
+    827:857:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2290:2320 -> a
+    858:863:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2319:2324 -> a
+    864:894:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2323:2353 -> a
+    895:908:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2349:2362 -> a
+    909:931:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2358:2380 -> a
+    932:940:void com.android.tools.r8.org.objectweb.asm.Attribute.putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int,com.android.tools.r8.org.objectweb.asm.ByteVector):307:315 -> a
+    932:940:void com.android.tools.r8.org.objectweb.asm.Attribute.putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):279 -> a
+    932:940:void putMethodInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):2380 -> a
+    941:942:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):2390:2391 -> a
     void visitCode() -> b
     1:5:void visitParameter(java.lang.String,int):642:646 -> b
     6:23:void visitIntInsn(int,int):884:901 -> b
@@ -102704,25 +102323,23 @@
     37:46:void putFrameType(java.lang.Object):1974:1983 -> b
     void visitEnd() -> c
     1:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):670:675 -> c
-    7:21:void visitTypeInsn(int,java.lang.String):970:984 -> c
-    22:22:void visitTypeInsn(int,java.lang.String):977:977 -> c
-    23:23:void visitMaxs(int,int):1545:1545 -> c
-    24:28:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1560:1564 -> c
-    24:28:void visitMaxs(int,int):1546 -> c
-    29:29:int com.android.tools.r8.org.objectweb.asm.Frame.getAbstractTypeFromInternalName(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):302:302 -> c
-    29:29:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1564 -> c
-    29:29:void visitMaxs(int,int):1546 -> c
-    30:108:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1566:1644 -> c
-    30:108:void visitMaxs(int,int):1546 -> c
-    109:109:int com.android.tools.r8.org.objectweb.asm.Frame.getAbstractTypeFromInternalName(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):302:302 -> c
-    109:109:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1645 -> c
-    109:109:void visitMaxs(int,int):1546 -> c
-    110:121:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1645:1656 -> c
-    110:121:void visitMaxs(int,int):1546 -> c
-    122:223:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeMaxStackAndLocal():1662:1763 -> c
-    122:223:void visitMaxs(int,int):1548 -> c
-    224:227:void visitMaxs(int,int):1550:1553 -> c
-    228:228:void addSuccessorToCurrentBasicBlock(int,com.android.tools.r8.org.objectweb.asm.Label):1782:1782 -> c
+    7:7:void visitMaxs(int,int):1545:1545 -> c
+    8:12:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1560:1564 -> c
+    8:12:void visitMaxs(int,int):1546 -> c
+    13:13:int com.android.tools.r8.org.objectweb.asm.Frame.getAbstractTypeFromInternalName(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):302:302 -> c
+    13:13:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1564 -> c
+    13:13:void visitMaxs(int,int):1546 -> c
+    14:92:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1566:1644 -> c
+    14:92:void visitMaxs(int,int):1546 -> c
+    93:93:int com.android.tools.r8.org.objectweb.asm.Frame.getAbstractTypeFromInternalName(com.android.tools.r8.org.objectweb.asm.SymbolTable,java.lang.String):302:302 -> c
+    93:93:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1645 -> c
+    93:93:void visitMaxs(int,int):1546 -> c
+    94:105:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeAllFrames():1645:1656 -> c
+    94:105:void visitMaxs(int,int):1546 -> c
+    106:207:void com.android.tools.r8.org.objectweb.asm.MethodWriter.computeMaxStackAndLocal():1662:1763 -> c
+    106:207:void visitMaxs(int,int):1548 -> c
+    208:211:void visitMaxs(int,int):1550:1553 -> c
+    212:212:void addSuccessorToCurrentBasicBlock(int,com.android.tools.r8.org.objectweb.asm.Label):1782:1782 -> c
     1:31:void visitVarInsn(int,int):908:938 -> d
     32:70:void visitVarInsn(int,int):926:964 -> d
     71:86:int computeMethodInfoSize():2077:2092 -> d
@@ -102778,7 +102395,7 @@
     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.sF:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.lF:
     com.android.tools.r8.org.objectweb.asm.ModuleVisitor mv -> a
     1:1:void <init>(int):57:57 -> <init>
     2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:76 -> <init>
@@ -102798,7 +102415,7 @@
     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.tF:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.mF:
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> m
     int providesCount -> n
     com.android.tools.r8.org.objectweb.asm.ByteVector opens -> k
@@ -102828,7 +102445,7 @@
     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.zK:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.pK:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -102837,7 +102454,7 @@
     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.YP:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.OP:
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
     1:1:void <init>(int):57:57 -> <init>
     2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):68:76 -> <init>
@@ -102853,7 +102470,7 @@
     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.ZP:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.PP:
     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
@@ -102880,7 +102497,7 @@
     10:16:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:225 -> b
     10:16:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable):191 -> b
     10:16:int computeRecordComponentInfoSize():169 -> b
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.HX:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.xX:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -102950,58 +102567,58 @@
     184:184:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String):1241:1241 -> a
     184:184:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):999 -> a
     185:193:com.android.tools.r8.org.objectweb.asm.Symbol addConstantUtf8Reference(int,java.lang.String):1000:1008 -> a
-    194:194:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,java.lang.String):1249:1249 -> a
-    194:194:int addConstantNameAndType(java.lang.String,java.lang.String):729 -> a
-    195:206:int addConstantNameAndType(java.lang.String,java.lang.String):730:741 -> a
-    207:207:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,java.lang.String,int):1254:1254 -> a
-    207:207:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):924 -> a
-    208:220:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):925:937 -> a
-    221:221:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,java.lang.String,java.lang.String):1259:1259 -> a
-    221:221:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):559 -> a
-    222:233:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):560:571 -> a
-    234:234:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):513:513 -> a
-    234:234:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):572 -> a
-    235:235:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):572:572 -> a
-    236:238:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):571:573 -> a
-    239:239:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,java.lang.String,java.lang.String,int):1268:1268 -> a
-    239:239:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):811 -> a
-    240:253:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):812:825 -> a
-    254:254:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantFieldref(java.lang.String,java.lang.String,java.lang.String):526:526 -> a
-    254:254:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):825 -> a
-    255:257:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):825:827 -> a
-    258:258:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantMethodref(java.lang.String,java.lang.String,java.lang.String,boolean):542:542 -> a
-    258:258:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):828 -> a
-    259:259:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):828:828 -> a
-    260:263:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):827:830 -> a
+    194:194:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,int):1245:1245 -> a
+    194:194:int addUninitializedType(java.lang.String,int):1161 -> a
+    195:205:int addUninitializedType(java.lang.String,int):1162:1172 -> a
+    206:215:int com.android.tools.r8.org.objectweb.asm.SymbolTable.addTypeInternal(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1216:1225 -> a
+    206:215:int addUninitializedType(java.lang.String,int):1172 -> a
+    216:216:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,java.lang.String):1249:1249 -> a
+    216:216:int addConstantNameAndType(java.lang.String,java.lang.String):729 -> a
+    217:228:int addConstantNameAndType(java.lang.String,java.lang.String):730:741 -> a
+    229:229:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,java.lang.String,int):1254:1254 -> a
+    229:229:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):924 -> a
+    230:242:com.android.tools.r8.org.objectweb.asm.Symbol addConstantDynamicOrInvokeDynamicReference(int,java.lang.String,java.lang.String,int):925:937 -> a
+    243:243:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,java.lang.String,java.lang.String):1259:1259 -> a
+    243:243:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):559 -> a
+    244:255:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):560:571 -> a
+    256:256:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):513:513 -> a
+    256:256:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):572 -> a
+    257:257:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):572:572 -> a
+    258:260:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry addConstantMemberReference(int,java.lang.String,java.lang.String,java.lang.String):571:573 -> a
+    261:261:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,java.lang.String,java.lang.String,int):1268:1268 -> a
+    261:261:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):811 -> a
+    262:275:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):812:825 -> a
+    276:276:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantFieldref(java.lang.String,java.lang.String,java.lang.String):526:526 -> a
+    276:276:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):825 -> a
+    277:279:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):825:827 -> a
+    280:280:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantMethodref(java.lang.String,java.lang.String,java.lang.String,boolean):542:542 -> a
+    280:280:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):828 -> a
+    281:281:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):828:828 -> a
+    282:285:com.android.tools.r8.org.objectweb.asm.Symbol addConstantMethodHandle(int,java.lang.String,java.lang.String,java.lang.String,boolean):827:830 -> a
     1:1:java.lang.String getClassName():306:306 -> b
-    2:2:void putConstantPool(com.android.tools.r8.org.objectweb.asm.ByteVector):348:348 -> b
-    3:3:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):394:394 -> b
-    4:4:com.android.tools.r8.org.objectweb.asm.Symbol addConstantModule(java.lang.String):972:972 -> b
-    5:14:int addMergedType(int,int):1193:1202 -> b
-    15:15:java.lang.ClassLoader com.android.tools.r8.org.objectweb.asm.ClassWriter.getClassLoader():1051:1051 -> b
-    15:15:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1014 -> b
-    15:15:int addMergedType(int,int):1202 -> b
-    16:38:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1017:1039 -> b
-    16:38:int addMergedType(int,int):1202 -> b
-    39:39:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1034:1034 -> b
-    39:39:int addMergedType(int,int):1202 -> b
-    40:41:int addMergedType(int,int):1202:1203 -> b
-    42:42:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1025:1025 -> b
-    42:42:int addMergedType(int,int):1202 -> b
-    43:43:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1019:1019 -> b
+    2:3:int setMajorVersionAndClassName(int,java.lang.String):318:319 -> b
+    4:4:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):513:513 -> b
+    4:4:int setMajorVersionAndClassName(int,java.lang.String):320 -> b
+    5:5:int setMajorVersionAndClassName(int,java.lang.String):320:320 -> b
+    6:6:void putConstantPool(com.android.tools.r8.org.objectweb.asm.ByteVector):348:348 -> b
+    7:7:com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry get(int):394:394 -> b
+    8:8:com.android.tools.r8.org.objectweb.asm.Symbol addConstantModule(java.lang.String):972:972 -> b
+    9:18:int addMergedType(int,int):1193:1202 -> b
+    19:19:java.lang.ClassLoader com.android.tools.r8.org.objectweb.asm.ClassWriter.getClassLoader():1051:1051 -> b
+    19:19:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1014 -> b
+    19:19:int addMergedType(int,int):1202 -> b
+    20:42:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1017:1039 -> b
+    20:42:int addMergedType(int,int):1202 -> b
+    43:43:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1034:1034 -> b
     43:43:int addMergedType(int,int):1202 -> b
-    44:44:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String,int):1245:1245 -> b
-    44:44:int addUninitializedType(java.lang.String,int):1161 -> b
-    45:55:int addUninitializedType(java.lang.String,int):1162:1172 -> b
-    56:65:int com.android.tools.r8.org.objectweb.asm.SymbolTable.addTypeInternal(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1216:1225 -> b
-    56:65:int addUninitializedType(java.lang.String,int):1172 -> b
-    1:2:int setMajorVersionAndClassName(int,java.lang.String):318:319 -> c
-    3:3:com.android.tools.r8.org.objectweb.asm.Symbol com.android.tools.r8.org.objectweb.asm.SymbolTable.addConstantClass(java.lang.String):513:513 -> c
-    3:3:int setMajorVersionAndClassName(int,java.lang.String):320 -> c
-    4:4:int setMajorVersionAndClassName(int,java.lang.String):320:320 -> c
-    5:5:int getConstantPoolCount():329:329 -> c
-    6:6:com.android.tools.r8.org.objectweb.asm.Symbol addConstantPackage(java.lang.String):983:983 -> c
-    7:7:com.android.tools.r8.org.objectweb.asm.Symbol getType(int):1129:1129 -> c
+    44:45:int addMergedType(int,int):1202:1203 -> b
+    46:46:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1025:1025 -> b
+    46:46:int addMergedType(int,int):1202 -> b
+    47:47:java.lang.String com.android.tools.r8.org.objectweb.asm.ClassWriter.getCommonSuperClass(java.lang.String,java.lang.String):1019:1019 -> b
+    47:47:int addMergedType(int,int):1202 -> b
+    1:1:int getConstantPoolCount():329:329 -> c
+    2:2:com.android.tools.r8.org.objectweb.asm.Symbol addConstantPackage(java.lang.String):983:983 -> c
+    3:3:com.android.tools.r8.org.objectweb.asm.Symbol getType(int):1129:1129 -> c
     1:1:int getConstantPoolLength():338:338 -> d
     2:2:int com.android.tools.r8.org.objectweb.asm.SymbolTable.hash(int,java.lang.String):1241:1241 -> d
     2:2:int addConstantUtf8(java.lang.String):764 -> d
@@ -103013,7 +102630,7 @@
     11:20:int com.android.tools.r8.org.objectweb.asm.SymbolTable.addTypeInternal(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1216:1225 -> e
     11:20:int addType(java.lang.String):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.GX:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.wX:
     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
@@ -103027,18 +102644,18 @@
     1:7:void <init>(int,int,long,int):1318 -> <init>
     8:8:void <init>(int,int,long,int):1319:1319 -> <init>
     9:15:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):220:226 -> <init>
-    9:15:void <init>(int,int,java.lang.String,java.lang.String,int):1313 -> <init>
-    16:16:void <init>(int,int,java.lang.String,java.lang.String,int):1314:1314 -> <init>
+    9:15:void <init>(int,int,java.lang.String,int):1302 -> <init>
+    16:16:void <init>(int,int,java.lang.String,int):1303:1303 -> <init>
     17:23:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):220:226 -> <init>
     17:23:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1297 -> <init>
     24:24:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1298:1298 -> <init>
     25:31:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):220:226 -> <init>
-    25:31:void <init>(int,int,java.lang.String,int):1302 -> <init>
-    32:32:void <init>(int,int,java.lang.String,int):1303:1303 -> <init>
+    25:31:void <init>(int,int,java.lang.String,long,int):1307 -> <init>
+    32:32:void <init>(int,int,java.lang.String,long,int):1308:1308 -> <init>
     33:39:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):220:226 -> <init>
-    33:39:void <init>(int,int,java.lang.String,long,int):1307 -> <init>
-    40:40:void <init>(int,int,java.lang.String,long,int):1308:1308 -> <init>
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.eZ:
+    33:39:void <init>(int,int,java.lang.String,java.lang.String,int):1313 -> <init>
+    40:40:void <init>(int,int,java.lang.String,java.lang.String,int):1314:1314 -> <init>
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.UY:
     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
@@ -103098,7 +102715,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> f
     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.d00:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.TZ:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -103115,7 +102732,7 @@
     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.e00:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.UZ:
     int targetTypeAndInfo -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:int getExceptionIndex():359:359 -> a
@@ -103126,7 +102743,7 @@
     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.mv:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.fv:
     java.util.BitSet mainSubroutineInsns -> F
     java.util.BitSet sharedSubroutineInsns -> H
     java.util.Map subroutinesInsns -> G
@@ -103252,7 +102869,7 @@
     142:144:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():315:317 -> c
     142:144:void visitEnd():155 -> c
     145:146:void visitEnd():157:158 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.lv:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.ev:
     java.util.Map clonedLabels -> d
     java.util.BitSet subroutineInsns -> c
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode returnLabel -> e
@@ -103270,7 +102887,7 @@
     2:2:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):558 -> get
     2:2: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.uU:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.kU:
     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
@@ -103282,7 +102899,7 @@
     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.vU:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.lU:
     1:1:void <init>(int):74:74 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.internal.w:
     java.util.List visibleTypeAnnotations -> b
@@ -103334,7 +102951,7 @@
     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.wa:
+com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.va:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     java.util.List invisibleAnnotations -> d
@@ -103371,7 +102988,7 @@
     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.Lj:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.Gj:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -103379,7 +102996,7 @@
     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.Tj:
+com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.internal.Oj:
     java.util.List visibleTypeAnnotations -> f
     java.util.List invisibleAnnotations -> e
     java.util.List visibleAnnotations -> d
@@ -103391,7 +103008,7 @@
     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.cl:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.Xk:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -103410,16 +103027,16 @@
     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.Pn:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.Ln:
     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.Ip:
+com.android.tools.r8.org.objectweb.asm.tree.InnerClassNode -> com.android.tools.r8.internal.Bp:
     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.Kp:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Dp:
     int size -> b
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode lastInsn -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] cache -> e
@@ -103442,7 +103059,7 @@
     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.Jp:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.Cp:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode remove -> d
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> e
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> b
@@ -103460,18 +103077,18 @@
     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.Lp:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.Ep:
     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.ht:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.at:
     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.xu:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.qu:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -103480,7 +103097,7 @@
     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.Uv:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.Nv:
     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
@@ -103489,7 +103106,7 @@
     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.vA:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.oA:
     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
@@ -103497,13 +103114,13 @@
     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.WA:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.PA:
     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.EB:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.xB:
     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>
@@ -103513,14 +103130,14 @@
     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.vC:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.oC:
     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.wC:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.pC:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -103528,7 +103145,7 @@
     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.bD:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.UC:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -103542,7 +103159,7 @@
     14:16:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     17:19: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.yE:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.rE:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -103551,7 +103168,7 @@
     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.CE:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.vE:
     java.util.List attrs -> r
     java.util.List invisibleTypeAnnotations -> q
     com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> x
@@ -103588,60 +103205,61 @@
     41:41:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):338:338 -> a
     42:42:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):332:332 -> a
     43:43:void visitInsn(int):343:343 -> a
-    44:44:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):364:364 -> a
-    45:52:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):374:381 -> a
-    53:53:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):390:390 -> a
-    54:54:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):397:397 -> a
-    55:55:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):402:402 -> a
-    56:56:void visitLdcInsn(java.lang.Object):407:407 -> a
-    57:57:void visitIincInsn(int,int):412:412 -> a
-    58:58:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):418:418 -> a
-    59:61:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):542:544 -> a
-    59:61:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):418 -> a
-    62:62:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):418:418 -> a
-    63:63:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):423:423 -> a
-    64:66:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):542:544 -> a
-    64:66:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):423 -> a
-    67:67:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):423:423 -> a
-    68:68:void visitMultiANewArrayInsn(java.lang.String,int):428:428 -> a
-    69:69:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):435:435 -> a
-    70:70:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
-    70:70:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):436 -> a
+    44:44:void visitTypeInsn(int,java.lang.String):358:358 -> a
+    45:45:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):364:364 -> a
+    46:53:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):374:381 -> a
+    54:54:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):390:390 -> a
+    55:55:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):397:397 -> a
+    56:56:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):402:402 -> a
+    57:57:void visitLdcInsn(java.lang.Object):407:407 -> a
+    58:58:void visitIincInsn(int,int):412:412 -> a
+    59:59:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):418:418 -> a
+    60:62:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):542:544 -> a
+    60:62:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):418 -> a
+    63:63:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):418:418 -> a
+    64:64:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):423:423 -> a
+    65:67:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):542:544 -> a
+    65:67:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):423 -> a
+    68:68:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):423:423 -> a
+    69:69:void visitMultiANewArrayInsn(java.lang.String,int):428:428 -> a
+    70:70:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):435:435 -> a
+    71:71:int com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getOpcode():137:137 -> a
+    71:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):436 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    71:71:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getPrevious():154:154 -> a
-    71:71:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):437 -> a
-    72:78:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):440:446 -> a
-    79:81:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):454:456 -> a
-    82:85:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):482:485 -> a
-    86:86: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):497:497 -> a
-    87:90:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):542:542 -> a
-    87:90: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):499 -> a
-    91:92:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):543:544 -> a
-    91:92: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):499 -> a
-    93:93:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode.<init>(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):87:87 -> a
-    93:93: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):499 -> a
-    94:98: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):501:505 -> a
-    99:101:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):660:662 -> a
-    102:102:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
-    102:102:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):662 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    72:72:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode.getPrevious():154:154 -> a
+    72:72:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):437 -> a
+    73:79:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):440:446 -> a
+    80:82:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):454:456 -> a
+    83:86:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):482:485 -> a
+    87:87: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):497:497 -> a
+    88:91:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):542:542 -> a
+    88:91: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):499 -> a
+    92:93:com.android.tools.r8.org.objectweb.asm.tree.LabelNode[] com.android.tools.r8.org.objectweb.asm.tree.MethodNode.getLabelNodes(com.android.tools.r8.org.objectweb.asm.Label[]):543:544 -> a
+    92:93: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):499 -> a
+    94:94:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode.<init>(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):87:87 -> a
+    94:94: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):499 -> a
+    95:99: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):501:505 -> a
+    100:102:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):660:662 -> a
     103:103:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
     103:103:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):662 -> a
-    104:127:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):666:689 -> a
-    128:137:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):688:697 -> a
-    138:188:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):696:746 -> a
-    189:189:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):89:89 -> a
-    189:189:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):746 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    190:196:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):90:96 -> a
-    190:196:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):746 -> a
-    197:205:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):747:755 -> a
-    206:206:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
-    206:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):755 -> a
+    104:104:void com.android.tools.r8.org.objectweb.asm.tree.ParameterNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:66 -> a
+    104:104:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):662 -> a
+    105:128:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):666:689 -> a
+    129:138:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):688:697 -> a
+    139:189:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):696:746 -> a
+    190:190:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):89:89 -> a
+    190:190:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):746 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    207:209:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
-    207:209:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):755 -> a
-    210:223:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):759:772 -> a
+    191:197:void com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode.updateIndex(int):90:96 -> a
+    191:197:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):746 -> a
+    198:206:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):747:755 -> a
+    207:207:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
+    207:207:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):755 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    208:210:void com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode.accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):89:89 -> a
+    208:210:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):755 -> a
+    211:224:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):759:772 -> a
     void visitCode() -> b
     1:4:void visitParameter(java.lang.String,int):241:244 -> b
     5:5:void visitIntInsn(int,int):348:348 -> b
@@ -103650,16 +103268,15 @@
     15:18:com.android.tools.r8.org.objectweb.asm.tree.LabelNode getLabelNode(com.android.tools.r8.org.objectweb.asm.Label):535:538 -> b
     void visitEnd() -> c
     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:6:void visitTypeInsn(int,java.lang.String):358:358 -> c
-    7:8:void visitMaxs(int,int):517:518 -> 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.BE:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.uE:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> b
     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.nF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.gF:
     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.oF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.hF:
     java.util.List packages -> b
     java.util.List uses -> f
     java.util.List opens -> e
@@ -103675,24 +103292,24 @@
     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.pF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.iF:
     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.qF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.jF:
     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.rF:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.kF:
     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.CF:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.vF:
     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.tL:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.jL:
     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.XP:
+com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.NP:
     java.util.List visibleAnnotations -> b
     java.util.List attrs -> f
     java.util.List invisibleTypeAnnotations -> e
@@ -103703,7 +103320,7 @@
     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.ZX:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.PX:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -103718,7 +103335,7 @@
     10:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     13:14: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.cZ:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.SY:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -103730,24 +103347,24 @@
     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.YZ:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.OZ:
     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.c00:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.SZ:
     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.d10:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.T00:
     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.u10:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.k10:
     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
@@ -103856,7 +103473,7 @@
     101:101: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):83:83 -> <init>
     90:90: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):83:83 -> <init>
     91:96: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:87 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.H4:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.G4:
     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
@@ -103872,7 +103489,7 @@
     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.I4:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.H4:
     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>
@@ -104081,7 +103698,7 @@
     589:589: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
     590:590: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
     591:591: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.al:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.Vk:
 # {"id":"sourceFile","fileName":"Frame.java"}
     int numStack -> d
     int maxStack -> e
@@ -104259,23 +103876,23 @@
     6:6:int com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.getStackSize():220:220 -> toString
     6:6:java.lang.String toString():747 -> toString
     7:9:java.lang.String toString():748:750 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.ju:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.cu:
     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
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value naryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.util.List) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode) -> 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.qX:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.gX:
     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.i10:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.Y00:
 # {"id":"sourceFile","fileName":"Value.java"}
-com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.n9:
+com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.m9:
     boolean useNamedValue -> b
     boolean visitEndCalled -> c
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,boolean):55:56 -> <init>
@@ -104315,7 +103932,7 @@
     53:53:void visitEnum(java.lang.String,java.lang.String,java.lang.String):96:96 -> a
     54:54:void com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter.checkVisitEndNotCalled():132:132 -> a
     54:54:void visitEnum(java.lang.String,java.lang.String,java.lang.String):91 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.s9:
+com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.r9:
     boolean visitNestHostCalled -> i
     java.lang.String nestMemberPackageName -> j
     boolean visitEndCalled -> k
@@ -104579,74 +104196,75 @@
     3237:3237:void checkAccess(int,int):547:547 -> a
     3238:3238:void checkAccess(int,int):547:547 -> a
     3216:3216:void checkAccess(int,int):547:547 -> a
-    3239:3240:int checkClassTypeSignature(java.lang.String,int):771:772 -> a
-    3241:3241:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3241:3241:int checkClassTypeSignature(java.lang.String,int):773 -> a
-    3242:3242:int checkClassTypeSignature(java.lang.String,int):774:774 -> a
-    3243:3243:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3243:3243:int checkClassTypeSignature(java.lang.String,int):776 -> a
-    3244:3244:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):800:800 -> a
-    3244:3244:int checkClassTypeSignature(java.lang.String,int):777 -> a
-    3245:3245:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3245:3245:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):824 -> a
-    3245:3245:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):801 -> a
-    3245:3245:int checkClassTypeSignature(java.lang.String,int):777 -> a
-    3246:3246:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):830:830 -> a
-    3246:3246:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):801 -> a
-    3246:3246:int checkClassTypeSignature(java.lang.String,int):777 -> a
-    3247:3247:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3247:3247:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):802 -> a
-    3247:3247:int checkClassTypeSignature(java.lang.String,int):777 -> a
+    3239:3245:void checkFullyQualifiedName(int,java.lang.String,java.lang.String):587:593 -> a
+    3246:3247:int checkClassTypeSignature(java.lang.String,int):771:772 -> a
     3248:3248:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3248:3248:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):824 -> a
-    3248:3248:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):803 -> a
-    3248:3248:int checkClassTypeSignature(java.lang.String,int):777 -> a
-    3249:3249:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):830:830 -> a
-    3249:3249:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):803 -> a
-    3249:3249:int checkClassTypeSignature(java.lang.String,int):777 -> a
+    3248:3248:int checkClassTypeSignature(java.lang.String,int):773 -> a
+    3249:3249:int checkClassTypeSignature(java.lang.String,int):774:774 -> a
     3250:3250:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3250:3250:int checkClassTypeSignature(java.lang.String,int):779 -> a
-    3251:3251:int checkClassTypeSignature(java.lang.String,int):780:780 -> a
+    3250:3250:int checkClassTypeSignature(java.lang.String,int):776 -> a
+    3251:3251:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):800:800 -> a
+    3251:3251:int checkClassTypeSignature(java.lang.String,int):777 -> a
     3252:3252:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3252:3252:int checkClassTypeSignature(java.lang.String,int):781 -> a
-    3253:3253:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):800:800 -> a
-    3253:3253:int checkClassTypeSignature(java.lang.String,int):782 -> a
+    3252:3252:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):824 -> a
+    3252:3252:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):801 -> a
+    3252:3252:int checkClassTypeSignature(java.lang.String,int):777 -> a
+    3253:3253:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):830:830 -> a
+    3253:3253:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):801 -> a
+    3253:3253:int checkClassTypeSignature(java.lang.String,int):777 -> a
     3254:3254:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3254:3254:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):824 -> a
-    3254:3254:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):801 -> a
-    3254:3254:int checkClassTypeSignature(java.lang.String,int):782 -> a
-    3255:3255:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):830:830 -> a
-    3255:3255:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):801 -> a
-    3255:3255:int checkClassTypeSignature(java.lang.String,int):782 -> a
-    3256:3256:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3256:3256:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):802 -> a
-    3256:3256:int checkClassTypeSignature(java.lang.String,int):782 -> a
+    3254:3254:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):802 -> a
+    3254:3254:int checkClassTypeSignature(java.lang.String,int):777 -> a
+    3255:3255:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
+    3255:3255:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):824 -> a
+    3255:3255:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):803 -> a
+    3255:3255:int checkClassTypeSignature(java.lang.String,int):777 -> a
+    3256:3256:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):830:830 -> a
+    3256:3256:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):803 -> a
+    3256:3256:int checkClassTypeSignature(java.lang.String,int):777 -> a
     3257:3257:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3257:3257:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):824 -> a
-    3257:3257:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):803 -> a
-    3257:3257:int checkClassTypeSignature(java.lang.String,int):782 -> a
-    3258:3258:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):830:830 -> a
-    3258:3258:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):803 -> a
-    3258:3258:int checkClassTypeSignature(java.lang.String,int):782 -> a
-    3259:3259:int checkClassTypeSignature(java.lang.String,int):785:785 -> a
-    3260:3260:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
-    3260:3260:int checkChar(char,java.lang.String,int):908 -> a
-    3261:3261:int checkChar(char,java.lang.String,int):911:911 -> a
-    3262:3262:void checkTypeRef(int):967:967 -> a
-    3263:3263:void checkTypeRef(int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4232,"2":4233,"3":4234}}
-    4232:4232:void checkTypeRef(int):967:967 -> a
-    4233:4233:void checkTypeRef(int):967:967 -> a
-    4234:4234:void checkTypeRef(int):967:967 -> a
-    4231:4231:void checkTypeRef(int):968:968 -> a
-    4235:4235:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1092:1092 -> a
-    4236:4236:void com.android.tools.r8.org.objectweb.asm.util.Textifier.<init>():115:115 -> a
-    4236:4236:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1092 -> a
-    4237:4237:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1093:1093 -> a
-    4238:4238:void com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor.<init>(com.android.tools.r8.org.objectweb.asm.util.Printer):55:55 -> a
-    4238:4238:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1093 -> a
-    4239:4261:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1095:1117 -> a
-    4262:4269:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1116:1123 -> a
+    3257:3257:int checkClassTypeSignature(java.lang.String,int):779 -> a
+    3258:3258:int checkClassTypeSignature(java.lang.String,int):780:780 -> a
+    3259:3259:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
+    3259:3259:int checkClassTypeSignature(java.lang.String,int):781 -> a
+    3260:3260:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):800:800 -> a
+    3260:3260:int checkClassTypeSignature(java.lang.String,int):782 -> a
+    3261:3261:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
+    3261:3261:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):824 -> a
+    3261:3261:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):801 -> a
+    3261:3261:int checkClassTypeSignature(java.lang.String,int):782 -> a
+    3262:3262:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):830:830 -> a
+    3262:3262:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):801 -> a
+    3262:3262:int checkClassTypeSignature(java.lang.String,int):782 -> a
+    3263:3263:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
+    3263:3263:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):802 -> a
+    3263:3263:int checkClassTypeSignature(java.lang.String,int):782 -> a
+    3264:3264:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
+    3264:3264:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):824 -> a
+    3264:3264:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):803 -> a
+    3264:3264:int checkClassTypeSignature(java.lang.String,int):782 -> a
+    3265:3265:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArgument(java.lang.String,int):830:830 -> a
+    3265:3265:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeArguments(java.lang.String,int):803 -> a
+    3265:3265:int checkClassTypeSignature(java.lang.String,int):782 -> a
+    3266:3266:int checkClassTypeSignature(java.lang.String,int):785:785 -> a
+    3267:3267:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> a
+    3267:3267:int checkChar(char,java.lang.String,int):908 -> a
+    3268:3268:int checkChar(char,java.lang.String,int):911:911 -> a
+    3269:3269:void checkTypeRef(int):967:967 -> a
+    3270:3270:void checkTypeRef(int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4239,"2":4240,"3":4241}}
+    4239:4239:void checkTypeRef(int):967:967 -> a
+    4240:4240:void checkTypeRef(int):967:967 -> a
+    4241:4241:void checkTypeRef(int):967:967 -> a
+    4238:4238:void checkTypeRef(int):968:968 -> a
+    4242:4242:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1092:1092 -> a
+    4243:4243:void com.android.tools.r8.org.objectweb.asm.util.Textifier.<init>():115:115 -> a
+    4243:4243:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1092 -> a
+    4244:4244:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1093:1093 -> a
+    4245:4245:void com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor.<init>(com.android.tools.r8.org.objectweb.asm.util.Printer):55:55 -> a
+    4245:4245:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1093 -> a
+    4246:4268:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1095:1117 -> a
+    4269:4276:void printAnalyzerResult(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.io.PrintWriter):1116:1123 -> a
     1:3:void visitNestMember(java.lang.String):309:311 -> b
     4:8:java.lang.String com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.packageName(java.lang.String):979:983 -> b
     4:8:void visitNestMember(java.lang.String):315 -> b
@@ -104659,22 +104277,21 @@
     21:26:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):385:390 -> b
     27:31:void checkState():530:534 -> b
     32:32:void checkState():531:531 -> b
-    33:39:void checkFullyQualifiedName(int,java.lang.String,java.lang.String):587:593 -> b
-    40:40:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> b
-    40:40:int checkReferenceTypeSignature(java.lang.String,int):743 -> b
-    41:43:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeVariableSignature(java.lang.String,int):845:847 -> b
-    41:43:int checkReferenceTypeSignature(java.lang.String,int):749 -> b
-    44:44:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> b
-    44:44:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkJavaTypeSignature(java.lang.String,int):866 -> b
-    44:44:int checkReferenceTypeSignature(java.lang.String,int):747 -> b
-    45:45:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkJavaTypeSignature(java.lang.String,int):877:877 -> b
-    45:45:int checkReferenceTypeSignature(java.lang.String,int):747 -> b
-    46:46:int checkReferenceTypeSignature(java.lang.String,int):745:745 -> b
+    33:33:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> b
+    33:33:int checkReferenceTypeSignature(java.lang.String,int):743 -> b
+    34:36:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkTypeVariableSignature(java.lang.String,int):845:847 -> b
+    34:36:int checkReferenceTypeSignature(java.lang.String,int):749 -> b
+    37:37:char com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.getChar(java.lang.String,int):922:922 -> b
+    37:37:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkJavaTypeSignature(java.lang.String,int):866 -> b
+    37:37:int checkReferenceTypeSignature(java.lang.String,int):747 -> b
+    38:38:int com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter.checkJavaTypeSignature(java.lang.String,int):877:877 -> b
+    38:38:int checkReferenceTypeSignature(java.lang.String,int):747 -> b
+    39:39:int checkReferenceTypeSignature(java.lang.String,int):745:745 -> b
     1:3:void visitPermittedSubclass(java.lang.String):327:329 -> c
     4:8:int checkSignatureIdentifier(java.lang.String,int):890:894 -> c
     1:3:void checkFieldSignature(java.lang.String):675:677 -> d
     1:13:java.lang.String getUnqualifiedName(java.lang.String):1127:1139 -> e
-com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.t9:
+com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.s9:
     boolean visitEndCalled -> c
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):70:70 -> <init>
     1:1:void com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter.checkVisitEndNotCalled():113:113 -> a
@@ -104708,7 +104325,7 @@
     113:113:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):88:88 -> a
     114:114:void com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter.checkVisitEndNotCalled() -> a
     114:114:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.w9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.v9:
     boolean visitCodeCalled -> n
     java.util.Map labelInsnIndices -> r
     int visibleAnnotableParameterCount -> l
@@ -104751,201 +104368,210 @@
     706:706:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):610:610 -> a
     707:707:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):577:577 -> a
     741:745:void visitInsn(int):645:649 -> a
-    746:750:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):703:707 -> a
-    751:751:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkUnqualifiedName(int,java.lang.String,java.lang.String):1214:1214 -> a
-    751:751:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):707 -> a
-    752:754:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):708:710 -> a
-    755:781:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):720:746 -> a
-    782:788:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):755:761 -> a
-    789:789:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1557,"2":1558,"3":1559}}
-    1557:1557:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):761:761 -> a
-    1558:1558:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):761:761 -> a
-    1559:1559:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):761:761 -> a
-    1550:1556:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):761:767 -> a
-    1560:1566:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):772:778 -> a
-    1567:1574:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):783:790 -> a
-    1575:1575:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):787:787 -> a
-    1576:1580:void visitLdcInsn(java.lang.Object):795:799 -> a
-    1581:1586:void visitIincInsn(int,int):804:809 -> a
-    1587:1587:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkSignedShort(int,java.lang.String):1121:1121 -> a
-    1587:1587:void visitIincInsn(int,int):807 -> a
-    1588:1599:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):815:826 -> a
-    1600:1600:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2440,"2":2441,"3":2442,"4":2443,"5":2444}}
-    2440:2440:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
-    2441:2441:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
-    2442:2442:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
-    2443:2443:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
-    2444:2444:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
-    2426:2430:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:830 -> a
-    2431:2431:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):823:823 -> a
-    2432:2432:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):818:818 -> a
-    2445:2452:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):835:842 -> a
-    2453:2453:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3304,"2":3305,"3":3306,"4":3307,"5":3308}}
-    3304:3304:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
-    3305:3305:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
-    3306:3306:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
-    3307:3307:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
-    3308:3308:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
-    3295:3300:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:847 -> a
-    3301:3301:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):839:839 -> a
-    3309:3326:void visitMultiANewArrayInsn(java.lang.String,int):852:869 -> a
-    3327:3327:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
-    3328:3328:void visitMultiANewArrayInsn(java.lang.String,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5920,"2":5921,"3":5922,"4":5923,"5":5924}}
-    5920:5920:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
-    5921:5921:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
-    5922:5922:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
-    5923:5923:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
-    5924:5924:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
-    4192:4192:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
-    4193:4193:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
-    4194:4194:void visitMultiANewArrayInsn(java.lang.String,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5925,"2":5926,"3":5927,"4":5928,"5":5929}}
-    5925:5925:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
-    5926:5926:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
-    5927:5927:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
-    5928:5928:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
-    5929:5929:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
-    5054:5054:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
-    5055:5055:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
-    5056:5056:void visitMultiANewArrayInsn(java.lang.String,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":5930,"2":5931,"3":5932,"4":5933,"5":5934}}
-    5930:5930:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
-    5931:5931:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
-    5932:5932:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
-    5933:5933:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
-    5934:5934:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
-    5912:5912:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
-    5935:5947:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):875:887 -> a
-    5948:5948:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6842,"2":6843,"3":6844}}
-    6842:6842:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):887:887 -> a
-    6843:6843:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):887:887 -> a
-    6844:6844:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):887:887 -> a
-    6835:6840:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):887:892 -> a
-    6841:6841:void com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter.<init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):51:51 -> a
-    6841:6841:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):892 -> a
-    6845:6860:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):898:913 -> a
-    6861:6861:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):906:906 -> a
-    6862:6864:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):939:941 -> a
-    6865:6865:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkUnqualifiedName(int,java.lang.String,java.lang.String):1214:1214 -> a
-    6865:6865:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):941 -> a
-    6866:6879:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):942:955 -> a
-    6880:6880:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):952:952 -> a
-    6881:6885: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):967:971 -> a
-    6886:6886: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7882,"2":7883,"3":7884}}
-    7882:7882: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):971:971 -> a
-    7883:7883: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):971:971 -> a
-    7884:7884: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):971:971 -> a
-    7857:7880: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):971:994 -> a
-    7881:7881: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):980:980 -> a
-    7885:7886:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1096:1097 -> a
-    7887:7887:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8985,"2":8986,"3":8987,"4":8988,"5":8989}}
-    8985:8985:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
-    8986:8986:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
-    8987:8987:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
-    8988:8988:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
-    8989:8989:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
-    8984:8984:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
-    8990:8996:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1233:1239 -> a
-    8997:9008:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1238:1249 -> a
-    9009:9013:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1246:1250 -> a
-    9014:9014:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
-    9015:9015:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10250,"2":10251,"3":10252,"4":10253,"5":10254,"6":10255}}
-    10250:10250:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
-    10251:10251:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
-    10252:10252:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
-    10253:10253:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
-    10254:10254:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
-    10255:10255:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
-    10249:10249:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
-    10256:10260:void checkInternalName(int,java.lang.String,java.lang.String):1297:1301 -> a
-    10261:10267:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkInternalClassName(int,java.lang.String,java.lang.String):1319:1325 -> a
-    10261:10267:void checkInternalName(int,java.lang.String,java.lang.String):1303 -> a
-    10268:10268:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
-    10269:10269:void checkInternalName(int,java.lang.String,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11568,"2":11569,"3":11570,"4":11571,"5":11572,"6":11573}}
-    11568:11568:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
-    11569:11569:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
-    11570:11570:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
-    11571:11571:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
-    11572:11572:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
-    11573:11573:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
-    11567:11567:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
-    11574:11615:int checkDescriptor(int,java.lang.String,int,boolean):1355:1396 -> a
-    11616:11616:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18625,"2":18626,"3":18627,"4":18628,"5":18629}}
-    18625:18625:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
-    18626:18626:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
-    18627:18627:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
-    18628:18628:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
-    18629:18629:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
-    13012:13012:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
-    13013:13019:int checkDescriptor(int,java.lang.String,int,boolean):1376:1382 -> a
-    13020:13020:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18630,"2":18631,"3":18632,"4":18633,"5":18634}}
-    18630:18630:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
-    18631:18631:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
-    18632:18632:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
-    18633:18633:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
-    18634:18634:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
-    14402:14402:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
-    14403:14403:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
-    14404:14404:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18635,"2":18636,"3":18637,"4":18638,"5":18639}}
-    18635:18635:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
-    18636:18636:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
-    18637:18637:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
-    18638:18638:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
-    18639:18639:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
-    15767:15794:int checkDescriptor(int,java.lang.String,int,boolean):1363:1390 -> a
-    15795:15801:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkInternalClassName(int,java.lang.String,java.lang.String):1319:1325 -> a
-    15795:15801:int checkDescriptor(int,java.lang.String,int,boolean):1390 -> a
-    15802:15802:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
-    15803:15803:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18668,"2":18669,"3":18670,"4":18671,"5":18672}}
-    18668:18668:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
-    18669:18669:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
-    18670:18670:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
-    18671:18671:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
-    18672:18672:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
-    17195:17195:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
-    17196:17196:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
-    17197:17197:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":18673,"2":18674,"3":18675,"4":18676,"5":18677}}
-    18673:18673:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
-    18674:18674:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
-    18675:18675:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
-    18676:18676:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
-    18677:18677:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
-    18584:18584:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
-    18585:18585:int checkDescriptor(int,java.lang.String,int,boolean):1356:1356 -> a
-    18678:18679:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1440:1441 -> a
-    18680:18680:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":21564,"2":21565,"3":21566,"4":21567,"5":21568,"6":21569}}
-    21564:21564:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
-    21565:21565:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
-    21566:21566:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
-    21567:21567:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
-    21568:21568:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
-    21569:21569:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
-    20121:20121:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
-    20122:20122:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
-    20123:20123:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":21570,"2":21571,"3":21572,"4":21573,"5":21574,"6":21575}}
-    21570:21570:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
-    21571:21571:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
-    21572:21572:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
-    21573:21573:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
-    21574:21574:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
-    21575:21575:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
-    21561:21561:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
+    746:751:void visitTypeInsn(int,java.lang.String):689:694 -> a
+    752:752:void visitTypeInsn(int,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1450,"2":1451,"3":1452,"4":1453,"5":1454}}
+    1450:1450:void visitTypeInsn(int,java.lang.String):694:694 -> a
+    1451:1451:void visitTypeInsn(int,java.lang.String):694:694 -> a
+    1452:1452:void visitTypeInsn(int,java.lang.String):694:694 -> a
+    1453:1453:void visitTypeInsn(int,java.lang.String):694:694 -> a
+    1454:1454:void visitTypeInsn(int,java.lang.String):694:694 -> a
+    1446:1449:void visitTypeInsn(int,java.lang.String):694:697 -> a
+    1455:1459:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):703:707 -> a
+    1460:1460:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkUnqualifiedName(int,java.lang.String,java.lang.String):1214:1214 -> a
+    1460:1460:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):707 -> a
+    1461:1463:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):708:710 -> a
+    1464:1490:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):720:746 -> a
+    1491:1497:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):755:761 -> a
+    1498:1498:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2266,"2":2267,"3":2268}}
+    2266:2266:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):761:761 -> a
+    2267:2267:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):761:761 -> a
+    2268:2268:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):761:761 -> a
+    2259:2265:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):761:767 -> a
+    2269:2275:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):772:778 -> a
+    2276:2283:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):783:790 -> a
+    2284:2284:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):787:787 -> a
+    2285:2289:void visitLdcInsn(java.lang.Object):795:799 -> a
+    2290:2295:void visitIincInsn(int,int):804:809 -> a
+    2296:2296:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkSignedShort(int,java.lang.String):1121:1121 -> a
+    2296:2296:void visitIincInsn(int,int):807 -> a
+    2297:2308:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):815:826 -> a
+    2309:2309:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3149,"2":3150,"3":3151,"4":3152,"5":3153}}
+    3149:3149:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
+    3150:3150:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
+    3151:3151:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
+    3152:3152:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
+    3153:3153:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:826 -> a
+    3135:3139:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):826:830 -> a
+    3140:3140:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):823:823 -> a
+    3141:3141:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):818:818 -> a
+    3154:3161:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):835:842 -> a
+    3162:3162:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4013,"2":4014,"3":4015,"4":4016,"5":4017}}
+    4013:4013:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
+    4014:4014:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
+    4015:4015:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
+    4016:4016:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
+    4017:4017:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:842 -> a
+    4004:4009:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):842:847 -> a
+    4010:4010:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):839:839 -> a
+    4018:4035:void visitMultiANewArrayInsn(java.lang.String,int):852:869 -> a
+    4036:4036:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
+    4037:4037:void visitMultiANewArrayInsn(java.lang.String,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6629,"2":6630,"3":6631,"4":6632,"5":6633}}
+    6629:6629:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
+    6630:6630:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
+    6631:6631:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
+    6632:6632:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
+    6633:6633:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
+    4901:4901:void visitMultiANewArrayInsn(java.lang.String,int):864:864 -> a
+    4902:4902:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
+    4903:4903:void visitMultiANewArrayInsn(java.lang.String,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6634,"2":6635,"3":6636,"4":6637,"5":6638}}
+    6634:6634:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
+    6635:6635:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
+    6636:6636:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
+    6637:6637:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
+    6638:6638:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
+    5763:5763:void visitMultiANewArrayInsn(java.lang.String,int):860:860 -> a
+    5764:5764:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
+    5765:5765:void visitMultiANewArrayInsn(java.lang.String,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6639,"2":6640,"3":6641,"4":6642,"5":6643}}
+    6639:6639:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
+    6640:6640:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
+    6641:6641:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
+    6642:6642:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
+    6643:6643:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
+    6621:6621:void visitMultiANewArrayInsn(java.lang.String,int):856:856 -> a
+    6644:6656:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):875:887 -> a
+    6657:6657:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7551,"2":7552,"3":7553}}
+    7551:7551:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):887:887 -> a
+    7552:7552:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):887:887 -> a
+    7553:7553:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):887:887 -> a
+    7544:7549:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):887:892 -> a
+    7550:7550:void com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter.<init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):51:51 -> a
+    7550:7550:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):892 -> a
+    7554:7569:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):898:913 -> a
+    7570:7570:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):906:906 -> a
+    7571:7573:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):939:941 -> a
+    7574:7574:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkUnqualifiedName(int,java.lang.String,java.lang.String):1214:1214 -> a
+    7574:7574:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):941 -> a
+    7575:7588:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):942:955 -> a
+    7589:7589:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):952:952 -> a
+    7590:7594: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):967:971 -> a
+    7595:7595: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8591,"2":8592,"3":8593}}
+    8591:8591: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):971:971 -> a
+    8592:8592: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):971:971 -> a
+    8593:8593: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):971:971 -> a
+    8566:8589: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):971:994 -> a
+    8590:8590: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):980:980 -> a
+    8594:8595:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1096:1097 -> a
+    8596:8596:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9694,"2":9695,"3":9696,"4":9697,"5":9698}}
+    9694:9694:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
+    9695:9695:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
+    9696:9696:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
+    9697:9697:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
+    9698:9698:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
+    9693:9693:void checkOpcodeMethod(int,com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method):1097:1097 -> a
+    9699:9705:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1233:1239 -> a
+    9706:9717:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1238:1249 -> a
+    9718:9722:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1246:1250 -> a
+    9723:9723:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
+    9724:9724:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10959,"2":10960,"3":10961,"4":10962,"5":10963,"6":10964}}
+    10959:10959:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
+    10960:10960:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
+    10961:10961:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
+    10962:10962:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
+    10963:10963:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
+    10964:10964:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
+    10958:10958:void checkIdentifier(int,java.lang.String,int,int,java.lang.String):1234:1234 -> a
+    10965:10969:void checkInternalName(int,java.lang.String,java.lang.String):1297:1301 -> a
+    10970:10976:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkInternalClassName(int,java.lang.String,java.lang.String):1319:1325 -> a
+    10970:10976:void checkInternalName(int,java.lang.String,java.lang.String):1303 -> a
+    10977:10977:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
+    10978:10978:void checkInternalName(int,java.lang.String,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":12277,"2":12278,"3":12279,"4":12280,"5":12281,"6":12282}}
+    12277:12277:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
+    12278:12278:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
+    12279:12279:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
+    12280:12280:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
+    12281:12281:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
+    12282:12282:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
+    12276:12276:void checkInternalName(int,java.lang.String,java.lang.String):1298:1298 -> a
+    12283:12324:int checkDescriptor(int,java.lang.String,int,boolean):1355:1396 -> a
+    12325:12325:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19334,"2":19335,"3":19336,"4":19337,"5":19338}}
+    19334:19334:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
+    19335:19335:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
+    19336:19336:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
+    19337:19337:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
+    19338:19338:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
+    13721:13721:int checkDescriptor(int,java.lang.String,int,boolean):1396:1396 -> a
+    13722:13728:int checkDescriptor(int,java.lang.String,int,boolean):1376:1382 -> a
+    13729:13729:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19339,"2":19340,"3":19341,"4":19342,"5":19343}}
+    19339:19339:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
+    19340:19340:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
+    19341:19341:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
+    19342:19342:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
+    19343:19343:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
+    15111:15111:int checkDescriptor(int,java.lang.String,int,boolean):1382:1382 -> a
+    15112:15112:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
+    15113:15113:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19344,"2":19345,"3":19346,"4":19347,"5":19348}}
+    19344:19344:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
+    19345:19345:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
+    19346:19346:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
+    19347:19347:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
+    19348:19348:int checkDescriptor(int,java.lang.String,int,boolean):1363:1363 -> a
+    16476:16503:int checkDescriptor(int,java.lang.String,int,boolean):1363:1390 -> a
+    16504:16510:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkInternalClassName(int,java.lang.String,java.lang.String):1319:1325 -> a
+    16504:16510:int checkDescriptor(int,java.lang.String,int,boolean):1390 -> a
+    16511:16511:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
+    16512:16512:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19377,"2":19378,"3":19379,"4":19380,"5":19381}}
+    19377:19377:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
+    19378:19378:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
+    19379:19379:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
+    19380:19380:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
+    19381:19381:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
+    17904:17904:int checkDescriptor(int,java.lang.String,int,boolean):1392:1392 -> a
+    17905:17905:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
+    17906:17906:int checkDescriptor(int,java.lang.String,int,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19382,"2":19383,"3":19384,"4":19385,"5":19386}}
+    19382:19382:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
+    19383:19383:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
+    19384:19384:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
+    19385:19385:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
+    19386:19386:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
+    19293:19293:int checkDescriptor(int,java.lang.String,int,boolean):1387:1387 -> a
+    19294:19294:int checkDescriptor(int,java.lang.String,int,boolean):1356:1356 -> a
+    19387:19388:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1440:1441 -> a
+    19389:19389:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":22273,"2":22274,"3":22275,"4":22276,"5":22277,"6":22278}}
+    22273:22273:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
+    22274:22274:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
+    22275:22275:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
+    22276:22276:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
+    22277:22277:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
+    22278:22278:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
+    20830:20830:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1441:1441 -> a
+    20831:20831:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
+    20832:20832:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":22279,"2":22280,"3":22281,"4":22282,"5":22283,"6":22284}}
+    22279:22279:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
+    22280:22280:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
+    22281:22281:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
+    22282:22282:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
+    22283:22283:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
+    22284:22284:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
+    22270:22270:void checkLabel(com.android.tools.r8.org.objectweb.asm.Label,boolean,java.lang.String):1438:1438 -> a
     1:1:void visitParameter(java.lang.String,int):484:484 -> b
     2:2:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkUnqualifiedName(int,java.lang.String,java.lang.String):1214:1214 -> b
     2:2:void visitParameter(java.lang.String,int):484 -> b
@@ -104992,6 +104618,15 @@
     2974:2974:void checkMethodIdentifier(int,java.lang.String,java.lang.String):1265:1265 -> b
     2975:2975:void checkMethodIdentifier(int,java.lang.String,java.lang.String):1265:1265 -> b
     2969:2969:void checkMethodIdentifier(int,java.lang.String,java.lang.String):1265:1265 -> b
+    2976:2978:void checkDescriptor(int,java.lang.String,boolean):1338:1340 -> b
+    2979:2979:void checkDescriptor(int,java.lang.String,boolean):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4320,"2":4321,"3":4322,"4":4323,"5":4324}}
+    4320:4320:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> b
+    4321:4321:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> b
+    4322:4322:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> b
+    4323:4323:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> b
+    4324:4324:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> b
+    4319:4319:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> b
     1:9:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):501:509 -> c
     10:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):0:0 -> c
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":526,"2":527,"3":528}}
@@ -105001,75 +104636,57 @@
     519:524:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):509:514 -> c
     525:525:void com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter.<init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):51:51 -> c
     525:525:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):514 -> c
-    529:534:void visitTypeInsn(int,java.lang.String):689:694 -> c
-    535:535:void visitTypeInsn(int,java.lang.String):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1233,"2":1234,"3":1235,"4":1236,"5":1237}}
-    1233:1233:void visitTypeInsn(int,java.lang.String):694:694 -> c
-    1234:1234:void visitTypeInsn(int,java.lang.String):694:694 -> c
-    1235:1235:void visitTypeInsn(int,java.lang.String):694:694 -> c
-    1236:1236:void visitTypeInsn(int,java.lang.String):694:694 -> c
-    1237:1237:void visitTypeInsn(int,java.lang.String):694:694 -> c
-    1229:1232:void visitTypeInsn(int,java.lang.String):694:697 -> c
-    1238:1253:void visitMaxs(int,int):1009:1024 -> c
-    1254:1262:void visitMaxs(int,int):1021:1029 -> c
-    1263:1265:void visitEnd():1034:1036 -> c
-    1266:1294:void checkLdcConstant(java.lang.Object):1159:1187 -> c
-    1295:1295:void checkLdcConstant(java.lang.Object):1177:1177 -> c
-    1296:1296:void checkLdcConstant(java.lang.Object):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2509,"2":2510,"3":2511,"4":2512,"5":2513}}
-    2509:2509:void checkLdcConstant(java.lang.Object):1177:1177 -> c
-    2510:2510:void checkLdcConstant(java.lang.Object):1177:1177 -> c
-    2511:2511:void checkLdcConstant(java.lang.Object):1177:1177 -> c
-    2512:2512:void checkLdcConstant(java.lang.Object):1177:1177 -> c
-    2513:2513:void checkLdcConstant(java.lang.Object):1177:1177 -> c
-    2473:2473:void checkLdcConstant(java.lang.Object):1177:1177 -> c
-    2474:2501:void checkLdcConstant(java.lang.Object):1172:1199 -> c
-    2502:2502:void checkLdcConstant(java.lang.Object):1191:1191 -> c
-    2503:2508:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkConstant(java.lang.Object):1144:1149 -> c
-    2503:2508:void checkLdcConstant(java.lang.Object):1202 -> c
+    529:544:void visitMaxs(int,int):1009:1024 -> c
+    545:553:void visitMaxs(int,int):1021:1029 -> c
+    554:556:void visitEnd():1034:1036 -> c
+    557:585:void checkLdcConstant(java.lang.Object):1159:1187 -> c
+    586:586:void checkLdcConstant(java.lang.Object):1177:1177 -> c
+    587:587:void checkLdcConstant(java.lang.Object):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1800,"2":1801,"3":1802,"4":1803,"5":1804}}
+    1800:1800:void checkLdcConstant(java.lang.Object):1177:1177 -> c
+    1801:1801:void checkLdcConstant(java.lang.Object):1177:1177 -> c
+    1802:1802:void checkLdcConstant(java.lang.Object):1177:1177 -> c
+    1803:1803:void checkLdcConstant(java.lang.Object):1177:1177 -> c
+    1804:1804:void checkLdcConstant(java.lang.Object):1177:1177 -> c
+    1764:1764:void checkLdcConstant(java.lang.Object):1177:1177 -> c
+    1765:1792:void checkLdcConstant(java.lang.Object):1172:1199 -> c
+    1793:1793:void checkLdcConstant(java.lang.Object):1191:1191 -> c
+    1794:1799:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter.checkConstant(java.lang.Object):1144:1149 -> c
+    1794:1799:void checkLdcConstant(java.lang.Object):1202 -> c
+    1805:1818:void checkMethodDescriptor(int,java.lang.String):1407:1420 -> c
+    1819:1819:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> c
+    1820:1820:void checkMethodDescriptor(int,java.lang.String):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6092,"2":6093,"3":6094,"4":6095,"5":6096}}
+    6092:6092:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> c
+    6093:6093:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> c
+    6094:6094:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> c
+    6095:6095:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> c
+    6096:6096:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> c
+    3237:3244:void checkMethodDescriptor(int,java.lang.String):1417:1424 -> c
+    3245:3245:void checkMethodDescriptor(int,java.lang.String):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6103,"2":6104,"3":6105,"4":6106,"5":6107}}
+    6103:6103:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> c
+    6104:6104:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> c
+    6105:6105:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> c
+    6106:6106:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> c
+    6107:6107:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> c
+    4669:4669:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> c
+    4670:4670:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> c
+    4671:4671:void checkMethodDescriptor(int,java.lang.String):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6108,"2":6109,"3":6110,"4":6111,"5":6112}}
+    6108:6108:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> c
+    6109:6109:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> c
+    6110:6110:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> c
+    6111:6111:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> c
+    6112:6112:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> c
+    6082:6082:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> c
+    6083:6083:void checkMethodDescriptor(int,java.lang.String):1408:1408 -> c
     1:6:void visitVarInsn(int,int):679:684 -> d
     7:8:void checkVisitCodeCalled():1045:1046 -> d
-    9:11:void checkDescriptor(int,java.lang.String,boolean):1338:1340 -> d
-    12:12:void checkDescriptor(int,java.lang.String,boolean):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1353,"2":1354,"3":1355,"4":1356,"5":1357}}
-    1353:1353:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> d
-    1354:1354:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> d
-    1355:1355:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> d
-    1356:1356:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> d
-    1357:1357:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> d
-    1352:1352:void checkDescriptor(int,java.lang.String,boolean):1340:1340 -> d
+    9:9:void checkUnsignedShort(int,java.lang.String):1133:1133 -> d
     1:2:void checkVisitEndNotCalled():1060:1061 -> e
-    3:16:void checkMethodDescriptor(int,java.lang.String):1407:1420 -> e
-    17:17:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> e
-    18:18:void checkMethodDescriptor(int,java.lang.String):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4290,"2":4291,"3":4292,"4":4293,"5":4294}}
-    4290:4290:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> e
-    4291:4291:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> e
-    4292:4292:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> e
-    4293:4293:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> e
-    4294:4294:void checkMethodDescriptor(int,java.lang.String):1417:1417 -> e
-    1435:1442:void checkMethodDescriptor(int,java.lang.String):1417:1424 -> e
-    1443:1443:void checkMethodDescriptor(int,java.lang.String):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4301,"2":4302,"3":4303,"4":4304,"5":4305}}
-    4301:4301:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> e
-    4302:4302:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> e
-    4303:4303:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> e
-    4304:4304:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> e
-    4305:4305:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> e
-    2867:2867:void checkMethodDescriptor(int,java.lang.String):1424:1424 -> e
-    2868:2868:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> e
-    2869:2869:void checkMethodDescriptor(int,java.lang.String):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4306,"2":4307,"3":4308,"4":4309,"5":4310}}
-    4306:4306:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> e
-    4307:4307:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> e
-    4308:4308:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> e
-    4309:4309:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> e
-    4310:4310:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> e
-    4280:4280:void checkMethodDescriptor(int,java.lang.String):1411:1411 -> e
-    4281:4281:void checkMethodDescriptor(int,java.lang.String):1408:1408 -> e
     1:2:void checkVisitMaxsNotCalled():1053:1054 -> f
-    3:3:void checkUnsignedShort(int,java.lang.String):1133:1133 -> f
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.u9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.t9:
     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:15:void visitEnd():451:465 -> c
@@ -105078,7 +104695,7 @@
     21:22:void visitEnd():455:456 -> c
     23:27:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1.throwError(com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.lang.Exception):470:474 -> c
     23:27:void visitEnd():460 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.u9:
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_INT_INSN -> c
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_VAR_INSN -> d
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_TYPE_INSN -> e
@@ -105088,7 +104705,7 @@
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_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.y9:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.x9:
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet requiredModules -> c
     boolean visitEndCalled -> i
     int classVersion -> h
@@ -105119,12 +104736,12 @@
     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.x9:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.w9:
     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.B9:
+com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.A9:
     boolean visitEndCalled -> b
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):74:74 -> <init>
     1:1:void com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter.checkVisitEndNotCalled():117:117 -> a
@@ -105158,7 +104775,7 @@
     117:117:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):92:92 -> a
     118:118:void com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter.checkVisitEndNotCalled() -> a
     118:118:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):88 -> a
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.HM:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.xM:
     java.util.List text -> c
     java.lang.StringBuilder stringBuilder -> b
     java.lang.String[] TYPES -> e
@@ -105179,7 +104796,7 @@
     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.aY:
+com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.QX:
     java.lang.String tab2 -> g
     java.lang.String tab -> f
     java.lang.String ltab -> i
@@ -105315,7 +104932,7 @@
     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.GY:
+com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.wY:
     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
@@ -105323,7 +104940,7 @@
     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.HY:
+com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.xY:
     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
@@ -105355,104 +104972,111 @@
     38:40:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsn(int):873:875 -> a
     38:40:void visitInsn(int):135 -> a
     41:41:void visitInsn(int):136:136 -> a
-    42:42:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:160 -> a
-    43:43:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):909:909 -> a
-    43:43:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160 -> a
+    42:42:void visitTypeInsn(int,java.lang.String):153:153 -> a
+    43:43:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):899:899 -> a
+    43:43:void visitTypeInsn(int,java.lang.String):153 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    44:50:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):909:915 -> a
-    44:50:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160 -> a
-    51:51:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):161:161 -> a
-    52:52:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):173:173 -> a
-    53:53:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):965:965 -> a
-    53:53:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):181 -> a
+    44:48:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):899:903 -> a
+    44:48:void visitTypeInsn(int,java.lang.String):153 -> a
+    49:49:void visitTypeInsn(int,java.lang.String):154:154 -> a
+    50:50:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160:160 -> a
+    51:51:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):909:909 -> a
+    51:51:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    54:65:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):175:186 -> a
-    66:66:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196:196 -> a
-    67:67:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):943:943 -> a
-    67:67:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
+    52:58:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):909:915 -> a
+    52:58:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):160 -> a
+    59:59:void visitFieldInsn(int,java.lang.String,java.lang.String,java.lang.String):161:161 -> a
+    60:60:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):173:173 -> a
+    61:61:void com.android.tools.r8.org.objectweb.asm.util.Printer.visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String):965:965 -> a
+    61:61:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):181 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    68:89:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):943:964 -> a
-    68:89:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
-    90:90:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitType(com.android.tools.r8.org.objectweb.asm.Type):671:671 -> a
-    90:90:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):966 -> a
-    90:90:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
-    91:102:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):968:979 -> a
-    91:102:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
-    103:103:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):197:197 -> a
-    104:104:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202:202 -> a
-    105:105:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):984:984 -> a
-    105:105:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
+    62:73:void visitMethodInsn(int,java.lang.String,java.lang.String,java.lang.String,boolean):175:186 -> a
+    74:74:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196:196 -> a
+    75:75:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):943:943 -> a
+    75:75:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    106:110:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):984:988 -> a
-    106:110:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
-    111:111:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):203:203 -> a
-    112:112:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
-    113:113:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):993:993 -> a
-    113:113:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208 -> a
+    76:97:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):943:964 -> a
+    76:97:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
+    98:98:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitType(com.android.tools.r8.org.objectweb.asm.Type):671:671 -> a
+    98:98:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):966 -> a
+    98:98:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
+    99:110:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):968:979 -> a
+    99:110:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):196 -> a
+    111:111:void visitInvokeDynamicInsn(java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Handle,java.lang.Object[]):197:197 -> a
+    112:112:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202:202 -> a
+    113:113:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):984:984 -> a
+    113:113:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    114:118:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):993:997 -> a
-    114:118:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208 -> a
-    119:119:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):209:209 -> a
-    120:120:void visitLdcInsn(java.lang.Object):214:214 -> a
-    121:121:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):1002:1002 -> a
-    121:121:void visitLdcInsn(java.lang.Object):214 -> a
+    114:118:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):984:988 -> a
+    114:118:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):202 -> a
+    119:119:void visitJumpInsn(int,com.android.tools.r8.org.objectweb.asm.Label):203:203 -> a
+    120:120:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208:208 -> a
+    121:121:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):993:993 -> a
+    121:121:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    122:132:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):1002:1012 -> a
-    122:132:void visitLdcInsn(java.lang.Object):214 -> a
-    133:133:void visitLdcInsn(java.lang.Object):215:215 -> a
-    134:134:void visitIincInsn(int,int):220:220 -> a
-    135:135:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):1017:1017 -> a
-    135:135:void visitIincInsn(int,int):220 -> a
+    122:126:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLabel(com.android.tools.r8.org.objectweb.asm.Label):993:997 -> a
+    122:126:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):208 -> a
+    127:127:void visitLabel(com.android.tools.r8.org.objectweb.asm.Label):209:209 -> a
+    128:128:void visitLdcInsn(java.lang.Object):214:214 -> a
+    129:129:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):1002:1002 -> a
+    129:129:void visitLdcInsn(java.lang.Object):214 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    136:144:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):1017:1025 -> a
-    136:144:void visitIincInsn(int,int):220 -> a
-    145:145:void visitIincInsn(int,int):221:221 -> a
-    146:146:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227:227 -> a
-    147:147:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1031:1031 -> a
-    147:147:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
+    130:140:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLdcInsn(java.lang.Object):1002:1012 -> a
+    130:140:void visitLdcInsn(java.lang.Object):214 -> a
+    141:141:void visitLdcInsn(java.lang.Object):215:215 -> a
+    142:142:void visitIincInsn(int,int):220:220 -> a
+    143:143:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):1017:1017 -> a
+    143:143:void visitIincInsn(int,int):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    148:158:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1031:1041 -> a
-    148:158:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
-    159:159:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):228:228 -> a
-    160:160:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
-    161:161:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1046:1046 -> a
-    161:161:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233 -> a
+    144:152:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitIincInsn(int,int):1017:1025 -> a
+    144:152:void visitIincInsn(int,int):220 -> a
+    153:153:void visitIincInsn(int,int):221:221 -> a
+    154:154:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227:227 -> a
+    155:155:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1031:1031 -> a
+    155:155:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    162:172:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1046:1056 -> a
-    162:172:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233 -> a
-    173:173:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):234:234 -> a
-    174:174:void visitMultiANewArrayInsn(java.lang.String,int):239:239 -> a
-    175:175:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1061:1061 -> a
-    175:175:void visitMultiANewArrayInsn(java.lang.String,int):239 -> a
+    156:166:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1031:1041 -> a
+    156:166:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):227 -> a
+    167:167:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):228:228 -> a
+    168:168:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233:233 -> a
+    169:169:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1046:1046 -> a
+    169:169:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    176:180:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1061:1065 -> a
-    176:180:void visitMultiANewArrayInsn(java.lang.String,int):239 -> a
-    181:181:void visitMultiANewArrayInsn(java.lang.String,int):240:240 -> a
-    182:182:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246:246 -> a
-    183:183:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1071:1071 -> a
-    183:183:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246 -> a
+    170:180:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1046:1056 -> a
+    170:180:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):233 -> a
+    181:181:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):234:234 -> a
+    182:182:void visitMultiANewArrayInsn(java.lang.String,int):239:239 -> a
+    183:183:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1061:1061 -> a
+    183:183:void visitMultiANewArrayInsn(java.lang.String,int):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    184:185:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):247:248 -> a
-    186:186:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254:254 -> a
-    187:187:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1077:1077 -> a
-    187:187:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254 -> a
+    184:188:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMultiANewArrayInsn(java.lang.String,int):1061:1065 -> a
+    184:188:void visitMultiANewArrayInsn(java.lang.String,int):239 -> a
+    189:189:void visitMultiANewArrayInsn(java.lang.String,int):240:240 -> a
+    190:190:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246:246 -> a
+    191:191:com.android.tools.r8.org.objectweb.asm.util.Printer com.android.tools.r8.org.objectweb.asm.util.Textifier.visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):1071:1071 -> a
+    191:191:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):246 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    188:198:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1077:1087 -> a
-    188:198:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254 -> a
-    199:199:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):255:255 -> a
-    200:200:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274:274 -> a
-    201:201:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1115:1115 -> a
-    201:201:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
+    192:193:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitInsnAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):247:248 -> a
+    194:194:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254:254 -> a
+    195:195:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1077:1077 -> a
+    195:195:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    202:214:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1115:1127 -> a
-    202:214:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
-    215:227:void com.android.tools.r8.org.objectweb.asm.util.Textifier.appendJavaDeclaration(java.lang.String,java.lang.String):1346:1358 -> a
-    215:227:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1128 -> a
-    215:227:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
-    228:228:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1130:1130 -> a
-    228:228:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
-    229:229:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):275:275 -> a
-    230:233: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):287:290 -> a
+    196:206:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):1077:1087 -> a
+    196:206:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):254 -> a
+    207:207:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):255:255 -> a
+    208:208:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274:274 -> a
+    209:209:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1115:1115 -> a
+    209:209:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    210:222:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1115:1127 -> a
+    210:222:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
+    223:235:void com.android.tools.r8.org.objectweb.asm.util.Textifier.appendJavaDeclaration(java.lang.String,java.lang.String):1346:1358 -> a
+    223:235:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1128 -> a
+    223:235:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
+    236:236:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):1130:1130 -> a
+    236:236:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):274 -> a
+    237:237:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):275:275 -> a
+    238:241: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):287:290 -> a
     1:1:void visitParameter(java.lang.String,int):71:71 -> b
     2:2:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitParameter(java.lang.String,int):769:769 -> b
     2:2:void visitParameter(java.lang.String,int):71 -> b
@@ -105486,21 +105110,14 @@
     2:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):85 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):86:87 -> c
-    5:5:void visitTypeInsn(int,java.lang.String):153:153 -> c
-    6:6:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):899:899 -> c
-    6:6:void visitTypeInsn(int,java.lang.String):153 -> c
+    5:5:void visitMaxs(int,int):303:303 -> c
+    6:6:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1174:1174 -> c
+    6:6:void visitMaxs(int,int):303 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:11:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitTypeInsn(int,java.lang.String):899:903 -> c
-    7:11:void visitTypeInsn(int,java.lang.String):153 -> c
-    12:12:void visitTypeInsn(int,java.lang.String):154:154 -> c
-    13:13:void visitMaxs(int,int):303:303 -> c
-    14:14:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1174:1174 -> c
-    14:14:void visitMaxs(int,int):303 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:21:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1174:1180 -> c
-    15:21:void visitMaxs(int,int):303 -> c
-    22:22:void visitMaxs(int,int):304:304 -> c
-    23:24:void visitEnd():309:310 -> c
+    7:13:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitMaxs(int,int):1174:1180 -> c
+    7:13:void visitMaxs(int,int):303 -> c
+    14:14:void visitMaxs(int,int):304:304 -> c
+    15:16:void visitEnd():309:310 -> c
     1:1:void visitVarInsn(int,int):147:147 -> d
     2:2:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):892:892 -> d
     2:2:void visitVarInsn(int,int):147 -> d
@@ -105508,7 +105125,7 @@
     3:5:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):892:894 -> d
     3:5:void visitVarInsn(int,int):147 -> d
     6:6:void visitVarInsn(int,int):148:148 -> d
-com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.KY:
+com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.AY:
     int arrayStack -> j
     java.lang.String separator -> k
     int argumentStack -> i
@@ -105656,10 +105273,10 @@
     129:129:java.lang.String getDescription():62:62 -> getDescription
     63:63:java.lang.String getDescription():62:62 -> getDescription
     64:64:java.lang.String getDescription():0:0 -> getDescription
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":130,"2":131,"3":132}}
-    130:130:java.lang.String getDescription():62:62 -> getDescription
-    131:131:java.lang.String getDescription():62:62 -> getDescription
-    132:132:java.lang.String getDescription():62:62 -> getDescription
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":127,"2":128,"3":129}}
+    127:127:java.lang.String getDescription():62:62 -> getDescription
+    128:128:java.lang.String getDescription():62:62 -> getDescription
+    129:129:java.lang.String getDescription():62:62 -> getDescription
     126:126:java.lang.String getDescription():62:62 -> getDescription
     1:1:int getLine():40:40 -> getLine
     1:1:long getOffset():52:52 -> getOffset
@@ -105754,13 +105371,13 @@
     java.lang.String packageName -> a
     1:6:void <init>(java.lang.String):19:24 -> <init>
     7:7:void <init>(java.lang.String):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":37,"2":38,"3":39,"4":40,"5":41,"6":42}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":35,"2":36,"3":37,"4":38,"5":39,"6":40}}
+    35:35:void <init>(java.lang.String):24:24 -> <init>
+    36:36:void <init>(java.lang.String):24:24 -> <init>
     37:37:void <init>(java.lang.String):24:24 -> <init>
     38:38:void <init>(java.lang.String):24:24 -> <init>
     39:39:void <init>(java.lang.String):24:24 -> <init>
     40:40:void <init>(java.lang.String):24:24 -> <init>
-    41:41:void <init>(java.lang.String):24:24 -> <init>
-    42:42:void <init>(java.lang.String):24:24 -> <init>
     31:33:void <init>(java.lang.String):24:26 -> <init>
     34:34:void <init>(java.lang.String):21:21 -> <init>
     1:5:boolean equals(java.lang.Object):38:42 -> equals
@@ -105839,17 +105456,17 @@
     1:20:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):81:100 -> primitiveFromDescriptor
     1:20:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
     21:21:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):0:0 -> primitiveFromDescriptor
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":58,"2":59,"3":60,"4":61,"5":62}}
-    58:58:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
-    58:58:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
-    59:59:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
-    59:59:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
-    60:60:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
-    60:60:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
-    61:61:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
-    61:61:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
-    62:62:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
-    62:62:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":45,"2":46,"3":47,"4":48,"5":49}}
+    45:45:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
+    45:45:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
+    46:46:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
+    46:46:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
+    47:47:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
+    47:47:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
+    48:48:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
+    48:48:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
+    49:49:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
+    49:49:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
     22:22:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):100:100 -> primitiveFromDescriptor
     22:22:com.android.tools.r8.references.PrimitiveReference primitiveFromDescriptor(java.lang.String):71 -> primitiveFromDescriptor
     23:35:com.android.tools.r8.references.PrimitiveReference com.android.tools.r8.references.PrimitiveReference.fromDescriptor(java.lang.String):84:96 -> primitiveFromDescriptor
@@ -106065,7 +105682,7 @@
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):127:127 -> a
     5:5: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
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.vS:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.lS:
     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
@@ -106077,7 +105694,7 @@
     41:41:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):734:734 -> 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():1251:1251 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1239:1239 -> 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
@@ -106098,7 +105715,7 @@
     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.qS:
+com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.gS:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():87:87 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):87:87 -> <init>
@@ -106106,10 +105723,10 @@
     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.rS:
+com.android.tools.r8.repackaging.Repackaging$2 -> com.android.tools.r8.internal.hS:
     1:1:void <init>(com.android.tools.r8.graph.AppView):109:109 -> <init>
-    boolean isLegitimateToHaveEmptyMappings() -> m
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.sS:
+    boolean isLegitimateToHaveEmptyMappings() -> n
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.iS:
     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
@@ -106119,23 +105736,23 @@
     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():1259:1259 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1247:1247 -> 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():1263:1263 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1251:1251 -> a
     7:7:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):352 -> a
     8:14:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):354:360 -> a
     15:20:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):357:362 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1255:1255 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1243:1243 -> a
     21:21:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):362 -> a
     22:27:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):362:367 -> a
     28:32:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):373:377 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1259:1259 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1247:1247 -> a
     33:33:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):377 -> a
     34:34:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):378:378 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1263:1263 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1251:1251 -> a
     35:35:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):379 -> a
     36:40:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):381:385 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1255:1255 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1243:1243 -> a
     41:41:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):385 -> a
     42:42:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):385:385 -> a
     43:54: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):423:434 -> a
@@ -106149,8 +105766,8 @@
     494:498: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):444 -> a
     499:499: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:445 -> a
     1:13:boolean mayHavePinnedPackagePrivateOrProtectedItem(com.android.tools.r8.graph.ProgramPackage):396:408 -> b
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.tS:
-com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.uS:
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.jS:
+com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.kS:
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> g
     com.android.tools.r8.com.google.common.collect.BiMap mappings -> f
     boolean $assertionsDisabled -> h
@@ -106175,7 +105792,7 @@
     9:9:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
     9:9: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.wS:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.mS:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -106202,7 +105819,7 @@
     112:112:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
     112:112:void traceDexValue(com.android.tools.r8.graph.DexValue):90 -> a
     113:120:void traceDexValue(com.android.tools.r8.graph.DexValue):90:97 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.yS:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.oS:
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node libraryBoundaryNode -> e
     com.android.tools.r8.graph.ProgramPackage pkg -> b
     java.util.Map nodes -> c
@@ -106232,7 +105849,7 @@
     12:15:boolean com.android.tools.r8.graph.DexDefinition.isNotProgramDefinition(com.android.tools.r8.graph.AppView):142:145 -> b
     12: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.xS:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.nS:
     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>
@@ -106245,7 +105862,7 @@
     219:219:java.lang.String toString():216:216 -> toString
     220:220:java.lang.String toString():216:216 -> toString
     217:217:java.lang.String toString():216:216 -> toString
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.AS:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.qS:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> n
     boolean $assertionsDisabled -> p
     java.util.Map packageRenamings -> o
@@ -106258,14 +105875,14 @@
     13:13:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):70:70 -> a
     14:20:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):74:80 -> a
     21:21:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):77:77 -> a
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.zS:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.pS:
     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.BS:
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.rS:
     com.android.tools.r8.graph.InitClassLens initClassLens -> h
     boolean $assertionsDisabled -> k
     com.android.tools.r8.repackaging.RepackagingConstraintGraph constraintGraph -> g
@@ -106287,11 +105904,11 @@
     43:49:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
     50:56:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):77:83 -> a
     50:56:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     57:57:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     57:57:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
-    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     58:58:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84 -> a
     58:58:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
     59:62:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84:87 -> a
@@ -106529,16 +106146,16 @@
     1:3:void <init>(int,java.lang.String):18:20 -> <init>
     1:1:com.android.tools.r8.retrace.RetraceInvalidRewriteFrameDiagnostics create(int,java.lang.String):44:44 -> create
     1:1:java.lang.String getDiagnosticMessage():0:0 -> getDiagnosticMessage
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":72,"2":73,"3":74}}
-    72:72:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
-    73:73:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
-    74:74:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38,"2":39,"3":40}}
+    38:38:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
+    39:39:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
+    40:40:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
     36:36:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
     37:37:java.lang.String getDiagnosticMessage():0:0 -> getDiagnosticMessage
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":75,"2":76,"3":77}}
-    75:75:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
-    76:76:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
-    77:77:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38,"2":39,"3":40}}
+    38:38:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
+    39:39:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
+    40:40:java.lang.String getDiagnosticMessage():35:35 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():25:25 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():30:30 -> getPosition
 com.android.tools.r8.retrace.RetraceInvalidStackTraceLineDiagnostics -> com.android.tools.r8.retrace.RetraceInvalidStackTraceLineDiagnostics:
@@ -106629,16 +106246,16 @@
     6:8:com.android.tools.r8.retrace.StringRetrace create(com.android.tools.r8.retrace.Retracer,com.android.tools.r8.DiagnosticsHandler,java.lang.String,boolean):64:66 -> create
     1:4:java.util.List retrace(java.util.List):79:82 -> retrace
     5:6:java.util.List retrace(java.lang.String):115:116 -> retrace
-com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.Ze:
+com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.Ue:
 # {"id":"sourceFile","fileName":"Definition.java"}
-com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.lh:
+com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.gh:
     com.android.tools.r8.naming.ClassNameMapper getClassNameMapper() -> a
     1:1:java.io.Reader get():11:11 -> get
     2:2:java.io.BufferedReader get():17:17 -> get
-com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.Jj:
+com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.Ej:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
-com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.Hj:
+com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.Cj:
     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>
@@ -106650,7 +106267,7 @@
     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.Ij:
+com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.Dj:
     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>
@@ -106661,11 +106278,11 @@
     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.xE:
+com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.qE:
     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
-com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.vE:
+com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.oE:
     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>
@@ -106677,7 +106294,7 @@
     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.wE:
+com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.pE:
     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>
@@ -106691,9 +106308,9 @@
     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.PS:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.FS:
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.SS:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.IS:
     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
@@ -106767,9 +106384,9 @@
     7:7:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.createElement():167:167 -> stream
     7:7:java.util.stream.Stream stream():157 -> stream
     8:8:java.util.stream.Stream stream():157:157 -> stream
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.QS:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.GS:
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.internal.RetracerImpl) -> a
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.RS:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.HS:
     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
@@ -106832,7 +106449,7 @@
     2:2:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):182 -> lookupMethod
     3:3:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):253:253 -> lookupMethod
     3:3:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):182 -> lookupMethod
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.US:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.KS:
     java.util.List memberNamings -> a
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     com.android.tools.r8.retrace.Retracer retracer -> c
@@ -106856,7 +106473,7 @@
     1:8:boolean isAmbiguous():85:92 -> isAmbiguous
     1:1:boolean isEmpty():97:97 -> isEmpty
     1:2:java.util.stream.Stream stream():43:44 -> stream
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.TS:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.JS:
     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
@@ -106871,7 +106488,7 @@
     1:1:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():142:142 -> getSourceFile
     1:1:boolean isCompilerSynthesized():117:117 -> isCompilerSynthesized
     1:1:boolean isUnknown():122:122 -> isUnknown
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.XS:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.NS:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     com.android.tools.r8.utils.OptionalBool isAmbiguousCache -> f
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> d
@@ -106955,7 +106572,7 @@
     20:34:boolean isAmbiguous():72:86 -> isAmbiguous
     1:1:boolean isEmpty():224:224 -> isEmpty
     1:2:java.util.stream.Stream stream():101:102 -> stream
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.VS:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.LS:
     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
@@ -107023,7 +106640,7 @@
     1:1:boolean isUnknown():275:275 -> isUnknown
     1:3:java.util.stream.Stream stream():303:305 -> stream
     1:3:java.util.stream.Stream streamRewritten(com.android.tools.r8.retrace.RetraceStackTraceContext):344:346 -> streamRewritten
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.WS:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.MS:
     com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange mappedRange -> a
     java.util.OptionalInt position -> b
     1:3:void <init>(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):394:396 -> <init>
@@ -107046,7 +106663,7 @@
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.getMappedRange():400:400 -> c
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange access$400(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):389 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.ZS:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.PS:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> b
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> d
@@ -107084,7 +106701,7 @@
     1:1:boolean isEmpty():69:69 -> isEmpty
     1:1:com.android.tools.r8.retrace.RetraceFrameResult narrowByPosition(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt):27:27 -> narrowByPosition
     1:2:java.util.stream.Stream stream():128:129 -> stream
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.YS:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.OS:
     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
@@ -107098,7 +106715,7 @@
     1:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():200:200 -> getSourceFile
     1:1:boolean isCompilerSynthesized():175:175 -> isCompilerSynthesized
     1:1:boolean isUnknown():180:180 -> isUnknown
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.bT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.RS:
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$1):16:16 -> <init>
@@ -107109,7 +106726,7 @@
     1:1:int getRewritePosition():56:56 -> b
     1:1:com.android.tools.r8.references.ClassReference getThrownException():28:28 -> c
     1:1:boolean hasRewritePosition():52:52 -> d
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.aT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.QS:
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:1:void <init>():81:81 -> <init>
@@ -107119,7 +106736,7 @@
     3:3:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl build():99:99 -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder clearRewritePosition():94:94 -> b
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder create():103:103 -> c
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.dT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.TS:
     com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation EMPTY -> b
     int removeInnerFramesCount -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -107127,12 +106744,12 @@
     2:3:void <init>(int):14:15 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation empty():23:23 -> a
     1:1:int getRemoveInnerFramesCount():19:19 -> b
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> com.android.tools.r8.internal.cT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> com.android.tools.r8.internal.SS:
     int removeInnerFramesCount -> a
     1:1:void <init>():30:30 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder incrementRemoveInnerFramesCount(int):36:36 -> a
     2:2:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation build():50:50 -> a
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.fT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.VS:
     java.util.stream.Stream resultStream -> a
     java.util.function.Supplier resultContext -> b
     1:1:void <init>(java.util.stream.Stream,java.util.function.Supplier,com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$1):14:14 -> <init>
@@ -107145,13 +106762,13 @@
     4:4:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder builder():38 -> a
     1:1:com.android.tools.r8.retrace.RetraceStackTraceContext getResultContext():34:34 -> getResultContext
     1:1:java.util.stream.Stream stream():29:29 -> stream
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.eT:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.US:
     java.util.stream.Stream resultStream -> a
     java.util.function.Supplier resultContext -> b
     1:1:void <init>():46:46 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl build():60:60 -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder create():64:64 -> b
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.hT:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.XS:
     com.android.tools.r8.references.ClassReference obfuscatedReference -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
     1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl,com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper):26:29 -> <init>
@@ -107161,7 +106778,7 @@
     7:7:com.android.tools.r8.retrace.RetraceThrownExceptionElement com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl.createElement():45:45 -> stream
     7:7:java.util.stream.Stream stream():34 -> stream
     8:8:java.util.stream.Stream stream():34:34 -> stream
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.gT:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.WS:
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
     com.android.tools.r8.references.ClassReference thrownException -> d
     com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl classReference -> b
@@ -107182,7 +106799,7 @@
     11:11:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl.getRetracedClass():73:73 -> getSourceFile
     11:11:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():92 -> getSourceFile
     12:12:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():92:92 -> getSourceFile
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.jT:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.ZS:
     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>
@@ -107193,11 +106810,11 @@
     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.iT:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.YS:
     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.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.kT:
+com.android.tools.r8.retrace.internal.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.aT:
     java.util.List elements -> a
     1:2:void <init>(java.util.List):21:22 -> <init>
     1:1:com.android.tools.r8.retrace.RetraceUnknownMappingInformationElement lambda$stream$0(com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation):30:30 -> a
@@ -107207,14 +106824,14 @@
     11:11:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):39 -> a
     12:12:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):40:40 -> a
     1:2:java.util.stream.Stream stream():27:28 -> stream
-com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.lT:
+com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.bT:
     com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation mappingInformation -> b
     com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult result -> a
     1:3:void <init>(com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult,com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation):19:21 -> <init>
     1:1:java.lang.String getIdentifier():26:26 -> getIdentifier
     1:1:java.lang.String getPayLoad():31:31 -> getPayLoad
     1:1:com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult getRetraceResultContext():36:36 -> getRetraceResultContext
-com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.mT:
+com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.cT:
     java.util.Set KEEP_SOURCEFILE_NAMES -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():31:33 -> <clinit>
@@ -107262,7 +106879,7 @@
     264:264:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):127 -> a
     265:265:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):140:140 -> a
     265:265:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):127 -> a
-com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.nT:
+com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.dT:
     com.android.tools.r8.references.ClassReference classReference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -107275,11 +106892,11 @@
     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.qT:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.gT:
     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$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.oT:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.eT:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     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>
@@ -107290,7 +106907,7 @@
     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.pT:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.fT:
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     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>
@@ -107299,7 +106916,7 @@
     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.tT:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.jT:
     java.util.Comparator comparator -> c
     int $r8$clinit -> d
     java.util.OptionalInt position -> b
@@ -107318,7 +106935,7 @@
     1:1:int getOriginalPositionOrDefault(int):50:50 -> getOriginalPositionOrDefault
     1:1:boolean hasPosition():45:45 -> hasPosition
     1:1:boolean isKnown():60:60 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.rT:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.hT:
     com.android.tools.r8.references.MethodReference methodReference -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():73:73 -> <clinit>
@@ -107334,14 +106951,14 @@
     1:2:com.android.tools.r8.references.TypeReference getReturnType():112:113 -> getReturnType
     1:1:int hashCode():140:140 -> hashCode
     1:1:boolean isVoid():92:92 -> isVoid
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.sT:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.iT:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> e
     1:1:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1):144:144 -> <init>
     2:3:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,java.util.OptionalInt):150:151 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl.getHolderClass():156:156 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():144 -> getHolderClass
     1:1:java.lang.String getMethodName():161:161 -> getMethodName
-com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.uT:
+com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.kT:
     com.android.tools.r8.retrace.RetracedMethodReference methodReference -> b
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl frameElement -> a
     int index -> c
@@ -107353,7 +106970,7 @@
     2:2:com.android.tools.r8.retrace.RetracedMethodReference com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl.getMethodReference():27:27 -> getSourceFile
     2:2:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():37 -> getSourceFile
     3:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():37:37 -> getSourceFile
-com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.vT:
+com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.lT:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String filename -> b
     boolean $assertionsDisabled -> c
@@ -107364,7 +106981,7 @@
     2:2:java.lang.String getOrInferSourceFile():36:36 -> getOrInferSourceFile
     1:1:java.lang.String getSourceFile():28:28 -> getSourceFile
     1:1:boolean hasRetraceResult():23:23 -> hasRetraceResult
-com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.wT:
+com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.mT:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.references.TypeReference typeReference -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -107377,7 +106994,7 @@
     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.xT:
+com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.nT:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     boolean $assertionsDisabled -> c
@@ -107418,7 +107035,7 @@
     4:4:com.android.tools.r8.retrace.RetraceThrownExceptionResult retraceThrownException(com.android.tools.r8.references.ClassReference):24 -> retraceThrownException
     1:1:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceType(com.android.tools.r8.references.TypeReference):101:101 -> retraceType
     1:1:com.android.tools.r8.retrace.RetraceTypeResult retraceType(com.android.tools.r8.references.TypeReference):24 -> retraceType
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.BV:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.rV:
     com.android.tools.r8.retrace.Retracer retracer -> a
     1:2:void <init>(com.android.tools.r8.retrace.Retracer):45:46 -> <init>
     1:4:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceClassOrType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.RetraceClassResult):81:84 -> a
@@ -107496,7 +107113,7 @@
     5:5:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.setResultContext(java.util.function.Supplier):55:55 -> retrace
     5:5:com.android.tools.r8.retrace.RetraceStackTraceElementProxyResult retrace(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceContext):55 -> retrace
     6:21:com.android.tools.r8.retrace.RetraceStackTraceElementProxyResult retrace(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceContext):56:71 -> retrace
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.AV:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.qV:
     boolean $assertionsDisabled -> m
     java.lang.String sourceFile -> h
     boolean isAmbiguous -> j
@@ -107551,7 +107168,7 @@
     1:1:boolean hasSourceFile():412:412 -> hasSourceFile
     1:1:boolean isAmbiguous():387:387 -> isAmbiguous
     1:1:boolean isTopFrame():392:392 -> isTopFrame
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.zV:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.pV:
     java.lang.String sourceFile -> g
     com.android.tools.r8.retrace.RetracedMethodReference methodContext -> c
     java.util.List methodArguments -> f
@@ -107616,7 +107233,7 @@
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setTopFrame(boolean):602:602 -> d
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$300(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,boolean):543 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.GV:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.wV:
     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
@@ -107662,19 +107279,19 @@
     1:1:boolean hasSourceFile():73:73 -> hasSourceFile
     1:9:java.lang.String com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,boolean):146:154 -> toRetracedItem
     1:9:java.lang.Object toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,boolean):23 -> toRetracedItem
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.CV:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.sV:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> c
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> b
     1:2:void <clinit>():167:168 -> <clinit>
     1:1:void <init>(java.lang.String,int):166:166 -> <init>
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.DV:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.tV:
     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>():367:367 -> <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):365:365 -> <init>
     2:3:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):382:383 -> <init>
     1:4:com.android.tools.r8.references.ClassReference getReference(java.lang.String):387:390 -> a
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.EV:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.uV:
     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
@@ -107716,7 +107333,7 @@
     43:43:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):216 -> d
     1:7:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerSourceFile(int,int):224:230 -> e
     8:8:java.lang.String lambda$registerSourceFile$2(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):229:229 -> e
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.FV:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.vV:
     com.android.tools.r8.utils.TriFunction retracedString -> c
     int endIndex -> b
     int startIndex -> a
@@ -107724,7 +107341,7 @@
     2:5:void <init>(int,int,com.android.tools.r8.utils.TriFunction):354:357 -> <init>
     1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):334:334 -> a
     2:2:boolean hasIndex():361:361 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.UV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.KV:
     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
@@ -107775,60 +107392,60 @@
     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$BinaryNameGroup -> com.android.tools.r8.internal.HV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.xV:
     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.JV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.zV:
     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.IV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.yV:
     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.KV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.AV:
     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.LV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.BV:
     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.MV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.CV:
     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.NV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.DV:
     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.OV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.EV:
     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.PV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.FV:
     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.QV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.GV:
     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.RV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.HV:
     1:1:void <init>():275:275 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):275:275 -> <init>
     1:1:java.lang.String subExpression():0:0 -> a
@@ -107842,12 +107459,12 @@
     283:283:java.lang.String subExpression():282:282 -> a
     290:290:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):287:287 -> a
     291:295: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.SV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.IV:
     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.TV:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.JV:
     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
@@ -108105,7 +107722,7 @@
     440:440:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342:342 -> a
     441:441: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):179:179 -> a
     441:441:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
-    442:442:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():634:634 -> a
+    442:442:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():633:633 -> a
     442:442: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):182 -> a
     442:442:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
     443:443: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):185:185 -> a
@@ -108122,7 +107739,7 @@
     456:457:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):366:367 -> a
     458:458:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):198:198 -> a
     458:458:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):367 -> a
-    459:459:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():634:634 -> a
+    459:459:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():633:633 -> a
     459:459:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):201 -> a
     459:459:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):367 -> a
     460:460:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):206:206 -> a
@@ -108250,10 +107867,10 @@
     46:48:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):474:476 -> a
     49:49:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):475:475 -> a
     50:61:void lambda$pruneMapFromMembers$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):478:489 -> a
-    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    62:62:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     62:62:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):668 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:63:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    63:63:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     63:63:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):668 -> a
     64:65:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):671:672 -> a
     66:77:void computeLargestCfVersion():678:678 -> a
@@ -108302,7 +107919,7 @@
     1182:1183:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMember):1039:1040 -> a
     1184:1184:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):1089:1089 -> a
     1185:1185:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1093:1093 -> a
-    1186:1186:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> a
+    1186:1186:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> a
     1186:1186:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1093 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1187:1188:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1093:1094 -> a
@@ -108696,7 +108313,7 @@
     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.P9:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.O9:
     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
@@ -108730,7 +108347,7 @@
     39:39:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):71 -> a
     40:50:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):77:87 -> a
     51:60:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):84:93 -> a
-com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.O9:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.N9:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():101:101 -> <clinit>
 com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.k:
@@ -108739,10 +108356,10 @@
     1:15: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.ClassInlineRule$Type):73:87 -> <init>
     1:7:java.lang.String typeString():110:116 -> C
     8:8:java.lang.String typeString():0:0 -> C
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":129,"2":130,"3":131}}
-    129:129:java.lang.String typeString():116:116 -> C
-    130:130:java.lang.String typeString():116:116 -> C
-    131:131:java.lang.String typeString():116:116 -> C
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":126,"2":127,"3":128}}
+    126:126:java.lang.String typeString():116:116 -> C
+    127:127:java.lang.String typeString():116:116 -> C
+    128:128:java.lang.String typeString():116:116 -> C
     124:124:java.lang.String typeString():116:116 -> C
     125:125:java.lang.String typeString():112:112 -> C
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type getType():95:95 -> D
@@ -108752,12 +108369,12 @@
     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() -> e
-com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.ea:
+com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.da:
 # {"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.Ub:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.Tb:
     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>
@@ -108822,7 +108439,7 @@
     1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):67:68 -> g
     3:4:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):144:145 -> g
     1:2:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):150:151 -> h
-com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.Ye:
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.Te:
     com.android.tools.r8.shaking.DefaultTreePrunerConfiguration INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -108838,7 +108455,7 @@
     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.bf:
+com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection -> com.android.tools.r8.internal.We:
     java.util.Map dependentMinimumKeepInfo -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -108901,7 +108518,7 @@
     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.oh:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.jh:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     java.util.List failed -> c
@@ -108923,7 +108540,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.shaking.DiscardedChecker createForMainDex(com.android.tools.r8.graph.AppView):41:41 -> b
     6:6:boolean isCheckDiscardedEnabled(com.android.tools.r8.graph.ProgramDefinition):66:66 -> b
-com.android.tools.r8.shaking.DiscardedChecker$1 -> com.android.tools.r8.internal.nh:
+com.android.tools.r8.shaking.DiscardedChecker$1 -> com.android.tools.r8.internal.ih:
     com.android.tools.r8.shaking.MinimumKeepInfoCollection val$unconditionalKeepInfo -> e
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MinimumKeepInfoCollection):41:41 -> <init>
     1:3:boolean isCheckDiscardedEnabled(com.android.tools.r8.graph.ProgramDefinition):45:45 -> b
@@ -109169,19 +108786,19 @@
     240:241:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):971:972 -> a
     242:273:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):978:1009 -> a
     274:274:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015:1015 -> a
-    275:275:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    275:275:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     275:275:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    276:276:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    276:276:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     276:276:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
     277:277:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015:1015 -> a
     278:281:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):281:284 -> a
     278:281:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
-    282:282:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> a
+    282:282:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> a
     282:282:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):284 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     282:282:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
-    283:283:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):910:910 -> a
+    283:283:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):908:908 -> a
     283:283:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):284 -> a
     283:283:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1015 -> a
     284:285:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1016:1017 -> a
@@ -109342,10 +108959,10 @@
     410:414:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1098 -> a
     415:415:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1099:1099 -> a
     416:428:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1128:1140 -> a
-    429:429:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    429:429:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     429:429:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1141 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    430:430:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
+    430:430:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1634:1634 -> a
     430:430:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1141 -> a
     431:438:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1141:1148 -> a
     439:439:boolean lambda$isConstClassMaybeUsedAsLock$10(com.android.tools.r8.code.CfOrDexInstruction):1133:1133 -> a
@@ -109559,889 +109176,926 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5706:5707:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):511:512 -> a
     5706:5707:boolean lambda$ensureMethodsContinueToWidenAccess$46(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1980 -> a
-    5708:5711:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2061:2064 -> a
-    5712:5717:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2094:2099 -> a
-    5712:5717:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2065 -> a
-    5718:5718:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2069:2069 -> a
-    5719:5719:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():48:48 -> a
-    5719:5719:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2069 -> a
-    5720:5737:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2069:2086 -> a
-    5738:5738:java.util.List lambda$processAnnotation$50(com.android.tools.r8.graph.DexAnnotation):2073:2073 -> a
-    5739:5740:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2105:2106 -> a
-    5741:5741:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):120:120 -> a
-    5741:5741:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2106 -> a
+    5708:5708:void lambda$ensureMethodsContinueToWidenAccess$47(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1981:1981 -> a
+    5709:5743:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1986:2020 -> a
+    5744:5744:boolean com.android.tools.r8.graph.DexClass.isPublic():741:741 -> a
+    5744:5744:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2022 -> a
+    5745:5745:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2023:2023 -> a
+    5746:5746:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> a
+    5746:5746:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2026 -> a
+    5747:5747:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2024:2024 -> a
+    5748:5748:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> a
+    5748:5748:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1994 -> a
+    5749:5752:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2061:2064 -> a
+    5753:5758:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2094:2099 -> a
+    5753:5758:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2065 -> a
+    5759:5759:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2069:2069 -> a
+    5760:5760:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():48:48 -> a
+    5760:5760:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2069 -> a
+    5761:5778:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2069:2086 -> a
+    5779:5779:java.util.List lambda$processAnnotation$50(com.android.tools.r8.graph.DexAnnotation):2073:2073 -> a
+    5780:5781:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2105:2106 -> a
+    5782:5782:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):120:120 -> a
+    5782:5782:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2106 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5742:5742:void lambda$resolveField$51(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2109:2109 -> a
-    5743:5744:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):650:651 -> a
-    5743:5744:void lambda$resolveField$51(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2108 -> a
-    5745:5745:void lambda$resolveField$52(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2112:2112 -> a
-    5746:5747:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):650:651 -> a
-    5746:5747:void lambda$resolveField$52(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2113 -> a
-    5748:5751: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):2135:2138 -> a
-    5752:5757: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):2137:2142 -> a
-    5758:5762: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):2141:2145 -> a
-    5763:5794:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2272:2303 -> a
-    5763:5794:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2267 -> a
-    5795:5808:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2308:2321 -> a
-    5809:5809:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
-    5809:5809:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2321 -> a
-    5810:5820:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2322:2332 -> a
-    5821:5821:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
-    5821:5821:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2332 -> a
-    5822:5823:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2337:2338 -> a
-    5824:5824:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8173,"2":8174,"3":8175}}
-    8173:8173:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2338:2338 -> a
-    8174:8174:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2338:2338 -> a
-    8175:8175:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2338:2338 -> a
-    8162:8172:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2338:2348 -> a
-    8176:8178:void lambda$ensureFromLibraryOrThrow$53(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2326:2328 -> a
-    8179:8181:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2360:2362 -> a
-    8182:8182:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354:2354 -> a
-    8182:8182:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2363 -> a
-    8183:8183:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> a
-    8183:8183:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354 -> a
+    5783:5783:void lambda$resolveField$51(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2109:2109 -> a
+    5784:5785:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):650:651 -> a
+    5784:5785:void lambda$resolveField$51(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2108 -> a
+    5786:5786:void lambda$resolveField$52(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2112:2112 -> a
+    5787:5788:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):650:651 -> a
+    5787:5788:void lambda$resolveField$52(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2113 -> a
+    5789:5792: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):2135:2138 -> a
+    5793:5798: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):2137:2142 -> a
+    5799:5803: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):2141:2145 -> a
+    5804:5835:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2272:2303 -> a
+    5804:5835:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2267 -> a
+    5836:5849:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2308:2321 -> a
+    5850:5850:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
+    5850:5850:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2321 -> a
+    5851:5861:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2322:2332 -> a
+    5862:5862:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
+    5862:5862:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2332 -> a
+    5863:5864:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2337:2338 -> a
+    5865:5865:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8214,"2":8215,"3":8216}}
+    8214:8214:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2338:2338 -> a
+    8215:8215:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2338:2338 -> a
+    8216:8216:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2338:2338 -> a
+    8203:8213:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2338:2348 -> a
+    8217:8219:void lambda$ensureFromLibraryOrThrow$53(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2326:2328 -> a
+    8220:8222:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2360:2362 -> a
+    8223:8223:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354:2354 -> a
+    8223:8223:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2363 -> a
+    8224:8224:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> a
+    8224:8224:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8183:8183:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2363 -> a
-    8184:8184:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2355:2355 -> a
-    8184:8184:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2363 -> a
-    8185:8185:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2364:2364 -> a
-    8186:8186:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
-    8186:8186:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2364 -> a
-    8187:8187:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2370:2370 -> a
-    8188:8188:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2366:2366 -> a
-    8189:8189:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354:2354 -> a
-    8189:8189:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2367 -> a
-    8190:8190:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> a
-    8190:8190:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354 -> a
+    8224:8224:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2363 -> a
+    8225:8225:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2355:2355 -> a
+    8225:8225:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2363 -> a
+    8226:8226:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2364:2364 -> a
+    8227:8227:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> a
+    8227:8227:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2364 -> a
+    8228:8228:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2370:2370 -> a
+    8229:8229:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2366:2366 -> a
+    8230:8230:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354:2354 -> a
+    8230:8230:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2367 -> a
+    8231:8231:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> a
+    8231:8231:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8190:8190:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2367 -> a
-    8191:8191:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2355:2355 -> a
-    8191:8191:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2367 -> a
-    8192:8192:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2368:2368 -> a
-    8193:8193:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2372:2372 -> a
-    8194:8194:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354:2354 -> a
-    8194:8194:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2373 -> a
-    8195:8195:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> a
-    8195:8195:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354 -> a
+    8231:8231:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2367 -> a
+    8232:8232:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2355:2355 -> a
+    8232:8232:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2367 -> a
+    8233:8233:void lambda$keepClassAndAllMembers$55(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2368:2368 -> a
+    8234:8234:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2372:2372 -> a
+    8235:8235:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354:2354 -> a
+    8235:8235:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2373 -> a
+    8236:8236:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> a
+    8236:8236:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8195:8195:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2373 -> a
-    8196:8196:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2355:2355 -> a
-    8196:8196:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2373 -> a
-    8197:8197:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2374:2374 -> a
-    8198:8200:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2379:2381 -> a
-    8201:8203:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1804:1806 -> a
-    8201:8203:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2381 -> a
-    8204:8204:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2384:2384 -> a
-    8205:8205:void lambda$recordNonProgramClass$57(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2394:2394 -> a
-    8206:8206:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2407:2407 -> a
-    8206:8206:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2411 -> a
-    8206:8206:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):193 -> a
+    8236:8236:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2373 -> a
+    8237:8237:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2355:2355 -> a
+    8237:8237:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2373 -> a
+    8238:8238:void lambda$keepClassAndAllMembers$56(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2374:2374 -> a
+    8239:8241:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2379:2381 -> a
+    8242:8244:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1804:1806 -> a
+    8242:8244:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2381 -> a
+    8245:8245:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2384:2384 -> a
+    8246:8246:void lambda$recordNonProgramClass$57(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2394:2394 -> a
+    8247:8247:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2407:2407 -> a
+    8247:8247:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2411 -> a
+    8247:8247:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):193 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    8207:8207:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2407:2407 -> a
-    8207:8207:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2411 -> a
-    8207:8207:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):193 -> a
-    8208:8208:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2407:2407 -> a
-    8208:8208:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2411 -> a
-    8209:8209:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2407:2407 -> a
-    8209:8209:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2415 -> a
-    8209:8209:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2420 -> a
-    8210:8210: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):2460:2460 -> a
-    8211:8211:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    8211:8211: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):2460 -> a
+    8248:8248:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2407:2407 -> a
+    8248:8248:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2411 -> a
+    8248:8248:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):193 -> a
+    8249:8249:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2407:2407 -> a
+    8249:8249:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2411 -> a
+    8250:8250:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2407:2407 -> a
+    8250:8250:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2415 -> a
+    8250:8250:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2420 -> a
+    8251:8251: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):2460:2460 -> a
+    8252:8252:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    8252:8252: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):2460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8212:8212:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    8212:8212: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):2460 -> a
-    8213:8219: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):2460:2466 -> a
-    8220:8221: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):2496:2497 -> a
-    8220:8221: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):2470 -> a
-    8222:8223: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):2474:2475 -> a
-    8224:8224:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    8224:8224: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):2475 -> a
-    8225:8227: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):2478:2480 -> a
-    8228:8228:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    8228:8228:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2558 -> a
+    8253:8253:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    8253:8253: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):2460 -> a
+    8254:8260: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):2460:2466 -> a
+    8261:8262: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):2496:2497 -> a
+    8261:8262: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):2470 -> a
+    8263:8264: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):2474:2475 -> a
+    8265:8265:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    8265:8265: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):2475 -> a
+    8266:8268: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):2478:2480 -> a
+    8269:8269:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    8269:8269:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2558 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8228:8228: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):2483 -> a
-    8229:8229:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    8229:8229:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2558 -> a
-    8229:8229: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):2483 -> a
-    8230:8231:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2558:2559 -> a
-    8230:8231: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):2483 -> a
-    8232:8232:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-    8232:8232:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2561 -> a
-    8232:8232: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):2483 -> a
-    8233:8233:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2561:2561 -> a
-    8233:8233: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):2483 -> a
-    8234:8234:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2560:2560 -> a
-    8234:8234: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):2483 -> a
-    8235:8238:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2745:2748 -> a
-    8235:8238: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):2485 -> a
-    8239:8239:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
-    8239:8239:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2748 -> a
-    8239:8239: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):2485 -> a
-    8240:8245:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2749:2754 -> a
-    8240:8245: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):2485 -> a
-    8246:8246:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2758:2758 -> a
-    8246:8246: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):2487 -> a
-    8247:8247:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    8247:8247:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2758 -> a
+    8269:8269: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):2483 -> a
+    8270:8270:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    8270:8270:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2558 -> a
+    8270:8270: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):2483 -> a
+    8271:8272:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2558:2559 -> a
+    8271:8272: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):2483 -> a
+    8273:8273:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
+    8273:8273:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2561 -> a
+    8273:8273: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):2483 -> a
+    8274:8274:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2561:2561 -> a
+    8274:8274: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):2483 -> a
+    8275:8275:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2560:2560 -> a
+    8275:8275: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):2483 -> a
+    8276:8279:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2745:2748 -> a
+    8276:8279: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):2485 -> a
+    8280:8280:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
+    8280:8280:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2748 -> a
+    8280:8280: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):2485 -> a
+    8281:8286:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2749:2754 -> a
+    8281:8286: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):2485 -> a
+    8287:8287:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2758:2758 -> a
+    8287:8287: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):2487 -> a
+    8288:8288:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    8288:8288:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2758 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8247:8247: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):2487 -> a
-    8248:8248:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    8248:8248:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2758 -> a
-    8248:8248: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):2487 -> a
-    8249:8251:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2758:2760 -> a
-    8249:8251: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):2487 -> a
-    8252:8252:void lambda$processNewlyInstantiatedClass$58(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2468:2468 -> a
-    8253:8253:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2502:2502 -> a
-    8254:8254:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    8254:8254:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2502 -> a
+    8288:8288: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):2487 -> a
+    8289:8289:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    8289:8289:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2758 -> a
+    8289:8289: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):2487 -> a
+    8290:8292:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2758:2760 -> a
+    8290:8292: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):2487 -> a
+    8293:8293:void lambda$processNewlyInstantiatedClass$58(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2468:2468 -> a
+    8294:8294:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2502:2502 -> a
+    8295:8295:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    8295:8295:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2502 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8255:8255:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    8255:8255:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2502 -> a
-    8256:8260:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2502:2506 -> a
-    8261:8262:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2764:2765 -> a
-    8261:8262:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2507 -> a
-    8263:8271:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2573:2581 -> a
-    8272:8286:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2657:2671 -> a
-    8272:8286:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
-    8287:8287:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2668:2668 -> a
-    8287:8287:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
-    8288:8288:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    8288:8288:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2678 -> a
-    8288:8288:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
-    8289:8291:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2678:2680 -> a
-    8289:8291:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
-    8292:8296:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2679:2683 -> a
-    8292:8296:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
-    8297:8303:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2682:2688 -> a
-    8297:8303:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
-    8304:8304:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2685:2685 -> a
-    8304:8304:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
-    8305:8308:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2585:2588 -> a
-    8309:8309:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2599:2599 -> a
-    8310:8310:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
-    8310:8310:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2599 -> a
-    8311:8313:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2599:2599 -> a
-    8314:8314:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2594:2594 -> a
-    8314:8314:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2601 -> a
-    8315:8316:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2601:2602 -> a
-    8317:8331:void lambda$markProgramMethodOverridesAsLive$65(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):2604:2618 -> a
-    8332:8342:void lambda$markProgramMethodOverridesAsLive$64(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,java.util.List):2620:2630 -> a
-    8343:8343:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
-    8343:8343:void lambda$markProgramMethodOverridesAsLive$64(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,java.util.List):2630 -> a
+    8296:8296:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    8296:8296:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2502 -> a
+    8297:8301:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2502:2506 -> a
+    8302:8303:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2764:2765 -> a
+    8302:8303:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2507 -> a
+    8304:8312:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2573:2581 -> a
+    8313:8327:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2657:2671 -> a
+    8313:8327:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
+    8328:8328:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2668:2668 -> a
+    8328:8328:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
+    8329:8329:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    8329:8329:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2678 -> a
+    8329:8329:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
+    8330:8332:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2678:2680 -> a
+    8330:8332:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
+    8333:8337:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2679:2683 -> a
+    8333:8337:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
+    8338:8344:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2682:2688 -> a
+    8338:8344:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
+    8345:8345:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2685:2685 -> a
+    8345:8345:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2583 -> a
+    8346:8349:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2585:2588 -> a
+    8350:8350:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2599:2599 -> a
+    8351:8351:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
+    8351:8351:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2599 -> a
+    8352:8354:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2599:2599 -> a
+    8355:8355:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2594:2594 -> a
+    8355:8355:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2601 -> a
+    8356:8357:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2601:2602 -> a
+    8358:8372:void lambda$markProgramMethodOverridesAsLive$65(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):2604:2618 -> a
+    8373:8383:void lambda$markProgramMethodOverridesAsLive$64(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,java.util.List):2620:2630 -> a
+    8384:8384:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
+    8384:8384:void lambda$markProgramMethodOverridesAsLive$64(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,java.util.List):2630 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8344:8344:void lambda$markProgramMethodOverridesAsLive$64(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,java.util.List):2638:2638 -> a
-    8345:8346:void lambda$markProgramMethodOverridesAsLive$59(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):2625:2626 -> a
-    8347:8347:boolean lambda$markProgramMethodOverridesAsLive$60(com.android.tools.r8.graph.DexDefinition):2629:2629 -> a
-    8348:8348: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):160:160 -> a
-    8348:8348:boolean lambda$markProgramMethodOverridesAsLive$60(com.android.tools.r8.graph.DexDefinition):2629 -> a
+    8385:8385:void lambda$markProgramMethodOverridesAsLive$64(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,java.util.List):2638:2638 -> a
+    8386:8387:void lambda$markProgramMethodOverridesAsLive$59(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):2625:2626 -> a
+    8388:8388:boolean lambda$markProgramMethodOverridesAsLive$60(com.android.tools.r8.graph.DexDefinition):2629:2629 -> a
+    8389:8389: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):160:160 -> a
+    8389:8389:boolean lambda$markProgramMethodOverridesAsLive$60(com.android.tools.r8.graph.DexDefinition):2629 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8349:8349: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):160:160 -> a
-    8349:8349:boolean lambda$markProgramMethodOverridesAsLive$60(com.android.tools.r8.graph.DexDefinition):2629 -> a
-    8350:8350:void lambda$markProgramMethodOverridesAsLive$62(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2632:2632 -> a
-    8351:8353:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$61(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2635:2635 -> a
-    8354:8358:void lambda$markProgramMethodOverridesAsLive$63(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2641:2645 -> a
-    8359:8359:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
-    8359:8359:void lambda$markProgramMethodOverridesAsLive$63(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2647 -> a
-    8360:8360: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
-    8360:8360:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
-    8360:8360:void lambda$markProgramMethodOverridesAsLive$63(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2647 -> a
-    8361:8361:void lambda$markProgramMethodOverridesAsLive$63(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2645:2645 -> a
-    8362:8362:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2697:2697 -> a
-    8363:8378:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4270:4285 -> a
-    8363:8378:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
-    8379:8387:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4321:4329 -> a
-    8379:8387:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4291 -> a
-    8379:8387:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
-    8388:8402:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4292:4306 -> a
-    8388:8402:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
-    8403:8411:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4321:4329 -> a
-    8403:8411:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4310 -> a
-    8403:8411:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
-    8412:8414:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4310:4312 -> a
-    8412:8414:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
-    8415:8415:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2704:2704 -> a
-    8416:8416:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    8416:8416:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2709 -> a
-    8417:8417:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2712:2712 -> a
-    8418:8418:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2711:2711 -> a
-    8419:8419:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$66(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2707:2707 -> a
-    8420:8431:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2718:2729 -> a
-    8432:8434:void lambda$markOverridesAsLibraryMethodOverrides$67(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2731:2733 -> a
-    8435:8441:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2829:2835 -> a
-    8442:8442:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878:2878 -> a
-    8442:8442:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
-    8443:8443:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> a
-    8443:8443:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878 -> a
-    8443:8443:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
-    8444:8444:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2879:2879 -> a
-    8444:8444:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
-    8445:8445:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2043:2043 -> a
-    8445:8445:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
-    8445:8445:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
-    8446:8446:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
-    8446:8446:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2044 -> a
-    8446:8446:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
-    8446:8446:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
-    8447:8447:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049:2049 -> a
-    8447:8447:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> a
-    8447:8447:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
-    8447:8447:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
-    8448:8449:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2054:2055 -> a
-    8448:8449:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049 -> a
-    8448:8449:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> a
-    8448:8449:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
-    8448:8449:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
-    8450:8453:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2837:2840 -> a
-    8454:8454:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878:2878 -> a
-    8454:8454:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    8455:8455:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> a
-    8455:8455:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878 -> a
-    8455:8455:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    8456:8456:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2879:2879 -> a
-    8456:8456:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    8457:8457:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2043:2043 -> a
-    8457:8457:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
-    8457:8457:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    8458:8458:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
-    8458:8458:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2044 -> a
-    8458:8458:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
-    8458:8458:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    8459:8459:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049:2049 -> a
-    8459:8459:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> a
-    8459:8459:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
-    8459:8459:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    8460:8461:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2054:2055 -> a
-    8460:8461:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049 -> a
-    8460:8461:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> a
-    8460:8461:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
-    8460:8461:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
-    8462:8465:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2845:2848 -> a
-    8466:8466:void lambda$markFieldAsLive$68(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2848:2848 -> a
-    8467:8467:void lambda$markFieldAsReachable$70(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2874:2874 -> a
-    8468:8469:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2887:2888 -> a
-    8468:8469:void lambda$traceInstanceFieldRead$25(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1529 -> a
-    8470:8470:void lambda$traceInstanceFieldRead$25(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1530:1530 -> a
-    8471:8471:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2927:2927 -> a
-    8472:8473:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2937:2938 -> a
-    8474:8474:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2981:2981 -> a
-    8475:8475:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985:2985 -> a
-    8475:8475:void lambda$desugar$98(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3673 -> a
-    8476:8476:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2981:2981 -> a
-    8476:8476:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985 -> a
-    8476:8476:void lambda$desugar$98(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3673 -> a
-    8477:8477:void lambda$desugar$98(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3676:3676 -> a
-    8478:8479:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2997:2998 -> a
-    8480:8480:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):3003:3003 -> a
-    8480:8480:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2998 -> a
-    8481:8482:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3007:3008 -> a
-    8481:8482:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2999 -> a
-    8483:8493:boolean isReachable(com.android.tools.r8.graph.Definition):3012:3022 -> a
-    8494:8494:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2923:2923 -> a
-    8494:8494:boolean isReachable(com.android.tools.r8.graph.Definition):3023 -> a
-    8495:8495:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):2919:2919 -> a
-    8495:8495:boolean isReachable(com.android.tools.r8.graph.Definition):3023 -> a
-    8496:8497:boolean isReachable(com.android.tools.r8.graph.Definition):3025:3026 -> a
-    8498:8498:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985:2985 -> a
-    8498:8498:boolean isReachable(com.android.tools.r8.graph.Definition):3027 -> a
-    8499:8499:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2981:2981 -> a
-    8499:8499:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985 -> a
-    8499:8499:boolean isReachable(com.android.tools.r8.graph.Definition):3027 -> a
-    8500:8500:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2993:2993 -> a
-    8500:8500:boolean isReachable(com.android.tools.r8.graph.Definition):3027 -> a
-    8501:8501:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2989:2989 -> a
-    8501:8501:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2993 -> a
-    8501:8501:boolean isReachable(com.android.tools.r8.graph.Definition):3027 -> a
-    8502:8502:boolean isReachable(com.android.tools.r8.graph.Definition):3031:3031 -> a
-    8503:8504:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3007:3008 -> a
-    8503:8504:boolean isReachable(com.android.tools.r8.graph.Definition):3031 -> a
-    8505:8505:void forAllLiveClasses(java.util.function.Consumer):3035:3035 -> a
-    8506:8530:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3040:3064 -> a
-    8531:8531:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():135:135 -> a
-    8531:8531:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3072 -> a
+    8390:8390: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):160:160 -> a
+    8390:8390:boolean lambda$markProgramMethodOverridesAsLive$60(com.android.tools.r8.graph.DexDefinition):2629 -> a
+    8391:8391:void lambda$markProgramMethodOverridesAsLive$62(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2632:2632 -> a
+    8392:8394:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$61(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2635:2635 -> a
+    8395:8399:void lambda$markProgramMethodOverridesAsLive$63(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2641:2645 -> a
+    8400:8400:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    8400:8400:void lambda$markProgramMethodOverridesAsLive$63(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2647 -> a
+    8401:8401: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
+    8401:8401:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
+    8401:8401:void lambda$markProgramMethodOverridesAsLive$63(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2647 -> a
+    8402:8402:void lambda$markProgramMethodOverridesAsLive$63(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2645:2645 -> a
+    8403:8403:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2697:2697 -> a
+    8404:8419:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4270:4285 -> a
+    8404:8419:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
+    8420:8428:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4321:4329 -> a
+    8420:8428:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4291 -> a
+    8420:8428:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
+    8429:8443:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4292:4306 -> a
+    8429:8443:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
+    8444:8452:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4321:4329 -> a
+    8444:8452:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4310 -> a
+    8444:8452:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
+    8453:8455:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4310:4312 -> a
+    8453:8455:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2701 -> a
+    8456:8456:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2704:2704 -> a
+    8457:8457:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    8457:8457:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2709 -> a
+    8458:8458:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2712:2712 -> a
+    8459:8459:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2711:2711 -> a
+    8460:8460:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$66(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2707:2707 -> a
+    8461:8472:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2718:2729 -> a
+    8473:8475:void lambda$markOverridesAsLibraryMethodOverrides$67(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2731:2733 -> a
+    8476:8482:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2829:2835 -> a
+    8483:8483:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878:2878 -> a
+    8483:8483:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
+    8484:8484:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> a
+    8484:8484:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878 -> a
+    8484:8484:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
+    8485:8485:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2879:2879 -> a
+    8485:8485:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
+    8486:8486:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2043:2043 -> a
+    8486:8486:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
+    8486:8486:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
+    8487:8487:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
+    8487:8487:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2044 -> a
+    8487:8487:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
+    8487:8487:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
+    8488:8488:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049:2049 -> a
+    8488:8488:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> a
+    8488:8488:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
+    8488:8488:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
+    8489:8490:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2054:2055 -> a
+    8489:8490:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049 -> a
+    8489:8490:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> a
+    8489:8490:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
+    8489:8490:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2836 -> a
+    8491:8494:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2837:2840 -> a
+    8495:8495:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878:2878 -> a
+    8495:8495:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    8496:8496:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> a
+    8496:8496:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878 -> a
+    8496:8496:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    8497:8497:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2879:2879 -> a
+    8497:8497:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    8498:8498:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2043:2043 -> a
+    8498:8498:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
+    8498:8498:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    8499:8499:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
+    8499:8499:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2044 -> a
+    8499:8499:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
+    8499:8499:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    8500:8500:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049:2049 -> a
+    8500:8500:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> a
+    8500:8500:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
+    8500:8500:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    8501:8502:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2054:2055 -> a
+    8501:8502:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049 -> a
+    8501:8502:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> a
+    8501:8502:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> a
+    8501:8502:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2841 -> a
+    8503:8506:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2845:2848 -> a
+    8507:8507:void lambda$markFieldAsLive$68(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2848:2848 -> a
+    8508:8508:void lambda$markFieldAsReachable$70(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2874:2874 -> a
+    8509:8510:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2887:2888 -> a
+    8509:8510:void lambda$traceInstanceFieldRead$25(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1529 -> a
+    8511:8511:void lambda$traceInstanceFieldRead$25(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1530:1530 -> a
+    8512:8512:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2927:2927 -> a
+    8513:8514:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2937:2938 -> a
+    8515:8515:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2981:2981 -> a
+    8516:8516:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985:2985 -> a
+    8516:8516:void lambda$desugar$98(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3673 -> a
+    8517:8517:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2981:2981 -> a
+    8517:8517:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985 -> a
+    8517:8517:void lambda$desugar$98(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3673 -> a
+    8518:8518:void lambda$desugar$98(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3676:3676 -> a
+    8519:8520:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2997:2998 -> a
+    8521:8521:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):3003:3003 -> a
+    8521:8521:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2998 -> a
+    8522:8523:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3007:3008 -> a
+    8522:8523:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2999 -> a
+    8524:8534:boolean isReachable(com.android.tools.r8.graph.Definition):3012:3022 -> a
+    8535:8535:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2923:2923 -> a
+    8535:8535:boolean isReachable(com.android.tools.r8.graph.Definition):3023 -> a
+    8536:8536:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):2919:2919 -> a
+    8536:8536:boolean isReachable(com.android.tools.r8.graph.Definition):3023 -> a
+    8537:8538:boolean isReachable(com.android.tools.r8.graph.Definition):3025:3026 -> a
+    8539:8539:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985:2985 -> a
+    8539:8539:boolean isReachable(com.android.tools.r8.graph.Definition):3027 -> a
+    8540:8540:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2981:2981 -> a
+    8540:8540:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985 -> a
+    8540:8540:boolean isReachable(com.android.tools.r8.graph.Definition):3027 -> a
+    8541:8541:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2993:2993 -> a
+    8541:8541:boolean isReachable(com.android.tools.r8.graph.Definition):3027 -> a
+    8542:8542:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2989:2989 -> a
+    8542:8542:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2993 -> a
+    8542:8542:boolean isReachable(com.android.tools.r8.graph.Definition):3027 -> a
+    8543:8543:boolean isReachable(com.android.tools.r8.graph.Definition):3031:3031 -> a
+    8544:8545:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3007:3008 -> a
+    8544:8545:boolean isReachable(com.android.tools.r8.graph.Definition):3031 -> a
+    8546:8546:void forAllLiveClasses(java.util.function.Consumer):3035:3035 -> a
+    8547:8571:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3040:3064 -> a
+    8572:8572:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():135:135 -> a
+    8572:8572:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3072 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8532:8532:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3075:3075 -> a
-    8533:8533:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2594:2594 -> a
-    8533:8533:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3077 -> a
-    8534:8542:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3077:3085 -> a
-    8543:8543:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    8543:8543:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3085 -> a
-    8544:8559:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3090:3105 -> a
-    8560:8560:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
-    8560:8560:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3112 -> a
+    8573:8573:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3075:3075 -> a
+    8574:8574:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2594:2594 -> a
+    8574:8574:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3077 -> a
+    8575:8583:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3077:3085 -> a
+    8584:8584:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    8584:8584:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3085 -> a
+    8585:8600:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3090:3105 -> a
+    8601:8601:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):33:33 -> a
+    8601:8601:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8561:8561:void lambda$markVirtualMethodAsReachable$73(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3109:3109 -> a
-    8562:8562:void lambda$markVirtualMethodAsReachable$76(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3114:3114 -> a
-    8563:8565:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$75(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3117:3117 -> a
-    8566:8569:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3123:3126 -> a
-    8570:8570:void lambda$markVirtualDispatchTargetAsLive$79(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3126:3126 -> a
-    8571:8573:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):3131:3133 -> a
-    8571:8573:void lambda$markVirtualDispatchTargetAsLive$77(java.util.function.Function,com.android.tools.r8.graph.DexClassAndMethod):3124 -> a
-    8574:8577:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3139:3142 -> a
-    8574:8577:void lambda$markVirtualDispatchTargetAsLive$78(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3125 -> a
-    8578:8578:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3141:3141 -> a
-    8578:8578:void lambda$markVirtualDispatchTargetAsLive$78(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3125 -> a
-    8579:8580: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):3151:3152 -> a
-    8581:8584:void lambda$markFailedMethodResolutionTargets$80(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3154:3157 -> a
-    8585:8585:void lambda$markSuperMethodAsReachable$82(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3208:3208 -> a
-    8586:8586:void lambda$markSuperMethodAsReachable$82(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3207:3207 -> a
-    8587:8587:void lambda$traceMainDex$84(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3249:3249 -> a
-    8588:8594:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3261:3267 -> a
-    8595:8595:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):535:535 -> a
-    8595:8595:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3267 -> a
-    8596:8598:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3271:3273 -> a
-    8599:8599:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):535:535 -> a
-    8599:8599:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3273 -> a
-    8600:8600:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3275:3275 -> a
-    8601:8601:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):535:535 -> a
-    8601:8601:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3275 -> a
-    8602:8622:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3278:3298 -> a
-    8623:8626:void finalizeLibraryMethodOverrideInformation():3745:3748 -> a
-    8623:8626:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3299 -> a
-    8627:8628:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3300:3301 -> a
-    8629:8631:boolean verifyKeptGraph():3755:3757 -> a
-    8629:8631:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3301 -> a
-    8632:8637:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3302:3307 -> a
-    8638:8638:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():232:232 -> a
-    8638:8638:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3307 -> a
-    8639:8639:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3312:3312 -> a
-    8640:8640:void lambda$traceApplication$87(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3300:3300 -> a
-    8641:8642:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3317:3318 -> a
-    8643:8647:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3326:3330 -> a
-    8648:8648:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3353:3353 -> a
-    8648:8648:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
-    8649:8649:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
-    8649:8649:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> a
+    8602:8602:void lambda$markVirtualMethodAsReachable$73(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3109:3109 -> a
+    8603:8603:void lambda$markVirtualMethodAsReachable$76(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3114:3114 -> a
+    8604:8606:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$75(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3117:3117 -> a
+    8607:8610:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3123:3126 -> a
+    8611:8611:void lambda$markVirtualDispatchTargetAsLive$79(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3126:3126 -> a
+    8612:8614:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):3131:3133 -> a
+    8612:8614:void lambda$markVirtualDispatchTargetAsLive$77(java.util.function.Function,com.android.tools.r8.graph.DexClassAndMethod):3124 -> a
+    8615:8618:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3139:3142 -> a
+    8615:8618:void lambda$markVirtualDispatchTargetAsLive$78(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3125 -> a
+    8619:8619:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3141:3141 -> a
+    8619:8619:void lambda$markVirtualDispatchTargetAsLive$78(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3125 -> a
+    8620:8621: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):3151:3152 -> a
+    8622:8625:void lambda$markFailedMethodResolutionTargets$80(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3154:3157 -> a
+    8626:8626:void lambda$markSuperMethodAsReachable$82(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3208:3208 -> a
+    8627:8627:void lambda$markSuperMethodAsReachable$82(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3207:3207 -> a
+    8628:8628:void lambda$traceMainDex$84(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3249:3249 -> a
+    8629:8635:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3261:3267 -> a
+    8636:8636:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):535:535 -> a
+    8636:8636:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3267 -> a
+    8637:8639:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3271:3273 -> a
+    8640:8640:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):535:535 -> a
+    8640:8640:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3273 -> a
+    8641:8641:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3275:3275 -> a
+    8642:8642:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):535:535 -> a
+    8642:8642:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3275 -> a
+    8643:8663:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3278:3298 -> a
+    8664:8667:void finalizeLibraryMethodOverrideInformation():3745:3748 -> a
+    8664:8667:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3299 -> a
+    8668:8669:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3300:3301 -> a
+    8670:8672:boolean verifyKeptGraph():3755:3757 -> a
+    8670:8672:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3301 -> a
+    8673:8678:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3302:3307 -> a
+    8679:8679:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():232:232 -> a
+    8679:8679:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3307 -> a
+    8680:8680:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3312:3312 -> a
+    8681:8681:void lambda$traceApplication$87(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3300:3300 -> a
+    8682:8683:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3317:3318 -> a
+    8684:8688:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3326:3330 -> a
+    8689:8689:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3353:3353 -> a
+    8689:8689:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
+    8690:8690:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8690:8690:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8649:8649:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
-    8650:8650:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
-    8650:8650:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> a
-    8650:8650:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
-    8651:8651:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3355:3355 -> a
-    8651:8651:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
-    8652:8653:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:859 -> a
-    8652:8653:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
-    8652:8653:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
-    8654:8654:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
-    8654:8654:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> a
+    8690:8690:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
+    8691:8691:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8691:8691:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> a
+    8691:8691:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
+    8692:8692:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3355:3355 -> a
+    8692:8692:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
+    8693:8694:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:859 -> a
+    8693:8694:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
+    8693:8694:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
+    8695:8695:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
+    8695:8695:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8654:8654:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
-    8654:8654:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
-    8655:8655:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> a
-    8655:8655:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
-    8655:8655:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
-    8656:8656:void lambda$applyMinimumKeepInfo$88(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3330:3330 -> a
-    8657:8660:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3339:3342 -> a
-    8661:8661:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8661:8661:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3343 -> a
-    8662:8662:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8662:8662:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3343 -> a
+    8695:8695:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
+    8695:8695:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
+    8696:8696:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> a
+    8696:8696:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
+    8696:8696:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3331 -> a
+    8697:8697:void lambda$applyMinimumKeepInfo$88(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3330:3330 -> a
+    8698:8701:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3339:3342 -> a
+    8702:8702:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8702:8702:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3343 -> a
+    8703:8703:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8703:8703:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3343 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8663:8663:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3344:3344 -> a
-    8664:8664:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    8664:8664:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3344 -> a
+    8704:8704:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3344:3344 -> a
+    8705:8705:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
+    8705:8705:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3344 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8665:8665:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> a
-    8665:8665:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
+    8706:8706:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> a
+    8706:8706:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8665:8665:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3344 -> a
-    8666:8666:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3353:3353 -> a
-    8666:8666:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
-    8667:8667:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
-    8667:8667:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> a
+    8706:8706:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3344 -> a
+    8707:8707:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3353:3353 -> a
+    8707:8707:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
+    8708:8708:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8708:8708:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8667:8667:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
-    8668:8668:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
-    8668:8668:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> a
-    8668:8668:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
-    8669:8669:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3355:3355 -> a
-    8669:8669:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
-    8670:8671:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:859 -> a
-    8670:8671:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
-    8670:8671:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
-    8672:8672:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
-    8672:8672:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> a
+    8708:8708:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
+    8709:8709:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8709:8709:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> a
+    8709:8709:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
+    8710:8710:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3355:3355 -> a
+    8710:8710:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
+    8711:8712:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:859 -> a
+    8711:8712:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
+    8711:8712:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
+    8713:8713:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
+    8713:8713:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8672:8672:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
-    8672:8672:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
-    8673:8673:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> a
-    8673:8673:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
-    8673:8673:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
-    8674:8678:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3377:3381 -> a
-    8679:8679:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3400:3400 -> a
-    8679:8679:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8680:8680:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
-    8680:8680:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> a
+    8713:8713:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
+    8713:8713:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
+    8714:8714:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> a
+    8714:8714:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> a
+    8714:8714:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3346 -> a
+    8715:8719:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3377:3381 -> a
+    8720:8720:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3400:3400 -> a
+    8720:8720:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8721:8721:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8721:8721:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8680:8680:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8681:8681:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
-    8681:8681:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> a
-    8681:8681:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8682:8682:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3402:3402 -> a
-    8682:8682:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8683:8685:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):890:892 -> a
-    8683:8685:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8683:8685:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8686:8686:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
-    8686:8686:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895 -> a
+    8721:8721:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8722:8722:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8722:8722:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> a
+    8722:8722:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8723:8723:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3402:3402 -> a
+    8723:8723:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8724:8726:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):890:892 -> a
+    8724:8726:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8724:8726:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8727:8727:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
+    8727:8727:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8686:8686:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8686:8686:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8687:8687:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> a
-    8687:8687:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8687:8687:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8688:8688:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):894:894 -> a
-    8688:8688:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8688:8688:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8689:8689:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> a
-    8689:8689:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8689:8689:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
-    8690:8690:void lambda$applyMinimumKeepInfo$90(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3381:3381 -> a
-    8691:8694:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3388:3391 -> a
-    8695:8695:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8695:8695:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3392 -> a
-    8696:8696:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8696:8696:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3392 -> a
+    8727:8727:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8727:8727:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8728:8728:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> a
+    8728:8728:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8728:8728:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8729:8729:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):894:894 -> a
+    8729:8729:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8729:8729:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8730:8730:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> a
+    8730:8730:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8730:8730:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3382 -> a
+    8731:8731:void lambda$applyMinimumKeepInfo$90(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3381:3381 -> a
+    8732:8735:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3388:3391 -> a
+    8736:8736:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8736:8736:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3392 -> a
+    8737:8737:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8737:8737:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3392 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8697:8697:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3393:3393 -> a
-    8698:8698:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    8698:8698:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3393 -> a
+    8738:8738:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3393:3393 -> a
+    8739:8739:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
+    8739:8739:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3393 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8699:8699:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> a
-    8699:8699:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
+    8740:8740:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> a
+    8740:8740:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8699:8699:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3393 -> a
-    8700:8700:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3400:3400 -> a
-    8700:8700:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8701:8701:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
-    8701:8701:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> a
+    8740:8740:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3393 -> a
+    8741:8741:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3400:3400 -> a
+    8741:8741:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8742:8742:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8742:8742:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8701:8701:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8702:8702:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
-    8702:8702:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> a
-    8702:8702:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8703:8703:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3402:3402 -> a
-    8703:8703:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8704:8706:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):890:892 -> a
-    8704:8706:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8704:8706:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8707:8707:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
-    8707:8707:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895 -> a
+    8742:8742:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8743:8743:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8743:8743:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> a
+    8743:8743:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8744:8744:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3402:3402 -> a
+    8744:8744:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8745:8747:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):890:892 -> a
+    8745:8747:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8745:8747:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8748:8748:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
+    8748:8748:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8707:8707:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8707:8707:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8708:8708:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> a
-    8708:8708:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8708:8708:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8709:8709:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):894:894 -> a
-    8709:8709:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8709:8709:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8710:8710:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> a
-    8710:8710:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
-    8710:8710:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
-    8711:8716:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3422:3427 -> a
-    8717:8717:void lambda$applyMinimumKeepInfo$92(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3426:3426 -> a
-    8718:8721:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3440:3443 -> a
-    8722:8722:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8722:8722:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3444 -> a
-    8723:8723:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    8723:8723:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3444 -> a
+    8748:8748:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8748:8748:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8749:8749:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> a
+    8749:8749:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8749:8749:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8750:8750:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):894:894 -> a
+    8750:8750:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8750:8750:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8751:8751:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> a
+    8751:8751:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> a
+    8751:8751:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3395 -> a
+    8752:8757:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3422:3427 -> a
+    8758:8758:void lambda$applyMinimumKeepInfo$92(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3426:3426 -> a
+    8759:8762:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3440:3443 -> a
+    8763:8763:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8763:8763:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3444 -> a
+    8764:8764:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    8764:8764:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3444 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8724:8724:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3445:3445 -> a
-    8725:8725:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    8725:8725:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3445 -> a
+    8765:8765:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3445:3445 -> a
+    8766:8766:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
+    8766:8766:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3445 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8726:8726:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> a
-    8726:8726:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
+    8767:8767:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> a
+    8767:8767:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8726:8726:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3445 -> a
-    8727:8733:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3441:3447 -> a
-    8734:8737:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3483:3486 -> a
-    8738:8751:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3652:3665 -> a
-    8752:8752: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):74:74 -> a
-    8752:8752:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3666 -> a
-    8753:8773:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3681:3701 -> a
-    8774:8774:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985:2985 -> a
-    8774:8774:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3703 -> a
-    8775:8775:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2981:2981 -> a
-    8775:8775:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985 -> a
-    8775:8775:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3703 -> a
-    8776:8784:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3704:3712 -> a
-    8785:8785:void lambda$desugar$99(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3684:3684 -> a
-    8786:8786:void lambda$desugar$100(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3691:3691 -> a
-    8787:8789:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3716:3718 -> a
-    8790:8792:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3723:3725 -> a
-    8793:8870:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3765:3842 -> a
-    8871:8873:java.util.Set toDescriptorSet(java.util.Set):3986:3988 -> a
-    8871:8873:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3842 -> a
-    8874:8879:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3842:3847 -> a
-    8880:8882:java.util.Set toDescriptorSet(java.util.Set):3986:3988 -> a
-    8880:8882:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3847 -> a
-    8883:8897:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3847:3861 -> a
-    8898:8903:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3995:4000 -> a
-    8898:8903:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3868 -> a
-    8904:8913:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3869:3878 -> a
-    8914:8914:void lambda$createEnqueuerResult$101(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3768:3768 -> a
-    8915:8915:boolean lambda$createEnqueuerResult$102(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3774:3774 -> a
-    8916:8916:void lambda$createEnqueuerResult$103(com.android.tools.r8.graph.ClasspathOrLibraryClass):3798:3798 -> a
-    8917:8921:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):701:705 -> a
-    8917:8921:void lambda$createEnqueuerResult$103(com.android.tools.r8.graph.ClasspathOrLibraryClass):3798 -> a
-    8922:8922:void amendKeepInfoWithCompanionMethods():3888:3888 -> a
-    8923:8924:void forEachCompanionMethod(java.util.function.BiConsumer):3882:3883 -> a
-    8923:8924:void amendKeepInfoWithCompanionMethods():3888 -> a
-    8925:8927:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3890:3892 -> a
-    8928:8928:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> a
-    8928:8928:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3892 -> a
-    8929:8929:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():55:55 -> a
-    8929:8929:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):111 -> a
-    8929:8929:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3892 -> a
-    8930:8931:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> a
-    8930:8931:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3892 -> a
-    8932:8935:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3892:3895 -> a
-    8936:8936:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    8936:8936:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3895 -> a
-    8937:8937:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    8937:8937:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3895 -> a
+    8767:8767:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3445 -> a
+    8768:8774:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3441:3447 -> a
+    8775:8775:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3454:3454 -> a
+    8776:8776:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8776:8776:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3455 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8938:8941:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3896:3899 -> a
-    8942:8942:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3898:3898 -> a
-    8943:8953:java.util.Set amendWithCompanionMethods(java.util.Set):3904:3914 -> a
-    8954:8955:void lambda$amendWithCompanionMethods$106(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3910:3911 -> a
-    8956:8964:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3932:3940 -> a
-    8965:8965:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16858,"2":16859,"3":16860,"4":16861,"5":16862}}
-    16858:16858:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
-    16859:16859:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
-    16860:16860:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
-    16861:16861:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
-    16862:16862:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
-    12905:12908:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3943 -> a
-    12909:12909:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16865,"2":16866,"3":16867,"4":16868,"5":16869}}
-    16865:16865:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
-    16866:16866:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
-    16867:16867:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
-    16868:16868:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
-    16869:16869:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
-    16852:16857:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3948 -> a
-    16870:16870:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4006:4006 -> a
-    16871:16873:long getNumberOfLiveItems():4153:4155 -> a
-    16871:16873:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4009 -> a
-    16874:16874:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4010:4010 -> a
-    16875:16875:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16875:16875:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4010 -> a
+    8777:8777:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> a
+    8777:8777:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3455 -> a
+    8778:8778:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3456:3456 -> a
+    8779:8781:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):902:904 -> a
+    8779:8781:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> a
+    8782:8782:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
+    8782:8782:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):907 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16876:16876:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16876:16876:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4010 -> a
-    16877:16877:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4011:4011 -> a
-    16878:16878:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():338:338 -> a
-    16878:16878:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4011 -> a
+    8782:8782:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> a
+    8783:8783:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):907:907 -> a
+    8783:8783:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> a
+    8784:8784:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):906:906 -> a
+    8784:8784:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> a
+    8785:8785:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):904:904 -> a
+    8785:8785:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> a
+    8786:8786:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3459:3459 -> a
+    8787:8787:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> a
+    8787:8787:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3460 -> a
+    8788:8789:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2036:2037 -> a
+    8788:8789:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3460 -> a
+    8790:8793:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3483:3486 -> a
+    8794:8794:void lambda$applyMinimumKeepInfoDependentOn$94(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3489:3489 -> a
+    8795:8795:void lambda$applyMinimumKeepInfoDependentOn$95(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3491:3491 -> a
+    8796:8796:void lambda$applyMinimumKeepInfoDependentOn$96(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3493:3493 -> a
+    8797:8810:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3652:3665 -> a
+    8811:8811: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):74:74 -> a
+    8811:8811:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3666 -> a
+    8812:8832:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3681:3701 -> a
+    8833:8833:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985:2985 -> a
+    8833:8833:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3703 -> a
+    8834:8834:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2981:2981 -> a
+    8834:8834:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):2985 -> a
+    8834:8834:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3703 -> a
+    8835:8843:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3704:3712 -> a
+    8844:8844:void lambda$desugar$99(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3684:3684 -> a
+    8845:8845:void lambda$desugar$100(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3691:3691 -> a
+    8846:8848:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3716:3718 -> a
+    8849:8851:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3723:3725 -> a
+    8852:8929:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3765:3842 -> a
+    8930:8932:java.util.Set toDescriptorSet(java.util.Set):3986:3988 -> a
+    8930:8932:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3842 -> a
+    8933:8938:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3842:3847 -> a
+    8939:8941:java.util.Set toDescriptorSet(java.util.Set):3986:3988 -> a
+    8939:8941:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3847 -> a
+    8942:8956:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3847:3861 -> a
+    8957:8962:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3995:4000 -> a
+    8957:8962:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3868 -> a
+    8963:8972:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3869:3878 -> a
+    8973:8973:void lambda$createEnqueuerResult$101(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3768:3768 -> a
+    8974:8974:boolean lambda$createEnqueuerResult$102(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3774:3774 -> a
+    8975:8975:void lambda$createEnqueuerResult$103(com.android.tools.r8.graph.ClasspathOrLibraryClass):3798:3798 -> a
+    8976:8980:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):701:705 -> a
+    8976:8980:void lambda$createEnqueuerResult$103(com.android.tools.r8.graph.ClasspathOrLibraryClass):3798 -> a
+    8981:8981:void amendKeepInfoWithCompanionMethods():3888:3888 -> a
+    8982:8983:void forEachCompanionMethod(java.util.function.BiConsumer):3882:3883 -> a
+    8982:8983:void amendKeepInfoWithCompanionMethods():3888 -> a
+    8984:8986:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3890:3892 -> a
+    8987:8987:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> a
+    8987:8987:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3892 -> a
+    8988:8988:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():55:55 -> a
+    8988:8988:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):111 -> a
+    8988:8988:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3892 -> a
+    8989:8990:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> a
+    8989:8990:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3892 -> a
+    8991:8994:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3892:3895 -> a
+    8995:8995:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
+    8995:8995:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3895 -> a
+    8996:8996:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
+    8996:8996:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3895 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16879:16879:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():338:338 -> a
-    16879:16879:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4011 -> a
-    16880:16880:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4012:4012 -> a
-    16881:16883:long getNumberOfLiveItems():4153:4155 -> a
-    16881:16883:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4016 -> a
-    16884:16892:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4020:4028 -> a
-    16893:16893: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):2094:2094 -> a
-    16893:16893:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4029 -> a
-    16894:16903:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4030:4039 -> a
-    16904:16906:long getNumberOfLiveItems():4153:4155 -> a
-    16904:16906:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4039 -> a
-    16907:16908:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4039:4040 -> a
-    16909:16909:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16909:16909:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4040 -> a
+    8997:9000:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3896:3899 -> a
+    9001:9001:void lambda$amendKeepInfoWithCompanionMethods$105(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3898:3898 -> a
+    9002:9012:java.util.Set amendWithCompanionMethods(java.util.Set):3904:3914 -> a
+    9013:9014:void lambda$amendWithCompanionMethods$106(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3910:3911 -> a
+    9015:9023:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3932:3940 -> a
+    9024:9024:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16917,"2":16918,"3":16919,"4":16920,"5":16921}}
+    16917:16917:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
+    16918:16918:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
+    16919:16919:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
+    16920:16920:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
+    16921:16921:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3940 -> a
+    12964:12967:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3940:3943 -> a
+    12968:12968:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16924,"2":16925,"3":16926,"4":16927,"5":16928}}
+    16924:16924:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
+    16925:16925:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
+    16926:16926:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
+    16927:16927:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
+    16928:16928:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3943 -> a
+    16911:16916:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3943:3948 -> a
+    16929:16929:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4006:4006 -> a
+    16930:16932:long getNumberOfLiveItems():4153:4155 -> a
+    16930:16932:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4009 -> a
+    16933:16933:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4010:4010 -> a
+    16934:16934:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16934:16934:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4010 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16910:16910:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16910:16910:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4040 -> a
-    16911:16915:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4047:4051 -> a
-    16916:16916:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16916:16916:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4051 -> a
+    16935:16935:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16935:16935:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4010 -> a
+    16936:16936:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4011:4011 -> a
+    16937:16937:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():338:338 -> a
+    16937:16937:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4011 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16917:16917:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16917:16917:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4051 -> a
-    16918:16919:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4057:4058 -> a
-    16920:16920:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16920:16920:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4058 -> a
+    16938:16938:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():338:338 -> a
+    16938:16938:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4011 -> a
+    16939:16939:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4012:4012 -> a
+    16940:16942:long getNumberOfLiveItems():4153:4155 -> a
+    16940:16942:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4016 -> a
+    16943:16951:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4020:4028 -> a
+    16952:16952: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):2094:2094 -> a
+    16952:16952:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4029 -> a
+    16953:16962:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4030:4039 -> a
+    16963:16965:long getNumberOfLiveItems():4153:4155 -> a
+    16963:16965:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4039 -> a
+    16966:16967:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4039:4040 -> a
+    16968:16968:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16968:16968:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4040 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16921:16921:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16921:16921:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4058 -> a
-    16922:16938:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4063:4079 -> a
-    16939:16939:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16939:16939:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4079 -> a
+    16969:16969:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16969:16969:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4040 -> a
+    16970:16974:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4047:4051 -> a
+    16975:16975:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16975:16975:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4051 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16940:16940:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
-    16940:16940:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4079 -> a
-    16941:16956:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4087:4102 -> a
-    16957:16957:java.util.Set lambda$trace$107(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):4025:4025 -> a
-    16958:16958:void lambda$trace$108(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4057:4057 -> a
-    16959:16959:void lambda$postProcessingDesugaring$109(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4117:4117 -> a
-    16960:16960:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> a
-    16960:16960:void lambda$postProcessingDesugaring$109(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4121 -> a
+    16976:16976:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16976:16976:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4051 -> a
+    16977:16978:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4057:4058 -> a
+    16979:16979:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16979:16979:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4058 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16961:16964:void lambda$postProcessingDesugaring$109(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4121:4124 -> a
-    16965:16965: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):93:93 -> a
-    16965:16965:void lambda$postProcessingDesugaring$109(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4117 -> a
+    16980:16980:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16980:16980:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4058 -> a
+    16981:16997:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4063:4079 -> a
+    16998:16998:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16998:16998:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4079 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16966:16972:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4163:4169 -> a
-    16973:16975:void lambda$addConsequentRootSet$111(com.android.tools.r8.graph.DexType,java.util.Set):4171:4173 -> a
-    16976:16980:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):932:936 -> a
-    16976:16980:void lambda$addConsequentRootSet$111(com.android.tools.r8.graph.DexType,java.util.Set):4174 -> a
-    16981:16988:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4195:4202 -> a
-    16989:16992:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4201:4204 -> a
-    16993:16993:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4203:4203 -> a
-    16994:17001:void retainAnnotationForFinalTreeShaking(java.util.List):4223:4230 -> a
-    17002:17002:void retainAnnotationForFinalTreeShaking(java.util.List):4227:4227 -> a
-    17003:17006:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4262:4265 -> a
-    17007:17013:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4337:4343 -> a
-    17014:17014:com.android.tools.r8.shaking.Enqueuer$Mode getMode():515:515 -> a
-    17014:17014:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4397 -> a
-    17014:17014:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
-    17015:17015:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4397:4397 -> a
-    17015:17015:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
-    17016:17016:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3627:3627 -> a
-    17016:17016:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4398 -> a
-    17016:17016:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
-    17017:17019:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3621:3623 -> a
-    17017:17019:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3628 -> a
-    17017:17019:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4398 -> a
-    17017:17019:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
-    17020:17035:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3630:3645 -> a
-    17020:17035:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4398 -> a
-    17020:17035:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
-    17036:17036:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4403:4403 -> a
-    17036:17036:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
-    17037:17041:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4348:4352 -> a
-    17042:17042:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    17042:17042:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4352 -> a
-    17043:17043:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    17043:17043:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4354 -> a
-    17044:17044:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4354:4354 -> a
-    17045:17045:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    17045:17045:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4355 -> a
-    17046:17051:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4355:4360 -> a
-    17052:17052:void lambda$markMethodAsLive$112(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4360:4360 -> a
-    17053:17053:void lambda$markMethodAsTargeted$113(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4380:4380 -> a
-    17054:17054:void lambda$traceMethodDefinitionExcludingCode$114(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4390:4390 -> a
-    17055:17055:void lambda$traceCode$115(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4411:4411 -> a
-    17056:17056:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4437:4437 -> a
-    17057:17072:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4461:4476 -> a
-    17057:17072:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4439 -> a
-    17073:17073:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4443:4443 -> a
-    17074:17074:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    17074:17074:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4444 -> a
+    16999:16999:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():334:334 -> a
+    16999:16999:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4079 -> a
+    17000:17015:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4087:4102 -> a
+    17016:17016:java.util.Set lambda$trace$107(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):4025:4025 -> a
+    17017:17017:void lambda$trace$108(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4057:4057 -> a
+    17018:17018:void lambda$postProcessingDesugaring$109(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4117:4117 -> a
+    17019:17019:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> a
+    17019:17019:void lambda$postProcessingDesugaring$109(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17075:17075:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    17075:17075:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4444 -> a
-    17076:17080:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4445:4449 -> a
-    17081:17081:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> a
-    17081:17081:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():794 -> a
-    17081:17081:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4450 -> a
-    17082:17086:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4451:4455 -> a
-    17087:17087:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4452:4452 -> a
-    17088:17094:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4494:4500 -> a
-    17095:17102:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4604:4611 -> a
-    17095:17102:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17103:17105:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4610:4612 -> a
-    17103:17105:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17106:17106:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
-    17106:17106:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4618 -> a
-    17106:17106:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17107:17107:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4622:4622 -> a
-    17107:17107:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17108:17108:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17108:17108:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4624 -> a
-    17108:17108:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17109:17109:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4427:4427 -> a
-    17109:17109:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625 -> a
-    17109:17109:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17110:17110:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> a
-    17110:17110:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():794 -> a
-    17110:17110:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4428 -> a
-    17110:17110:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625 -> a
-    17110:17110:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17111:17113:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4429:4431 -> a
-    17111:17113:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625 -> a
-    17111:17113:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17114:17114:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4430:4430 -> a
-    17114:17114:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625 -> a
-    17114:17114:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17115:17118:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4626:4629 -> a
-    17115:17118:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17119:17119:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    17119:17119:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
-    17119:17119:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4628 -> a
-    17119:17119:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17120:17120:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
-    17120:17120:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4628 -> a
-    17120:17120:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
-    17121:17121:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4504:4504 -> a
-    17122:17143:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4636:4657 -> a
-    17122:17143:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17144:17146:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4656:4658 -> a
-    17144:17146:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17147:17147:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
-    17147:17147:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4664 -> a
-    17147:17147:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17148:17149:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4668:4669 -> a
-    17148:17149:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17150:17150:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    17150:17150:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4669 -> a
-    17150:17150:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17151:17199:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4674:4722 -> a
-    17151:17199:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17200:17200:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17200:17200:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4727 -> a
-    17200:17200:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17201:17201:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4427:4427 -> a
-    17201:17201:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728 -> a
-    17201:17201:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17202:17202:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> a
-    17202:17202:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():794 -> a
-    17202:17202:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4428 -> a
-    17202:17202:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728 -> a
-    17202:17202:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17203:17205:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4429:4431 -> a
-    17203:17205:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728 -> a
+    17020:17023:void lambda$postProcessingDesugaring$109(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4121:4124 -> a
+    17024:17024: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):93:93 -> a
+    17024:17024:void lambda$postProcessingDesugaring$109(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4117 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    17025:17031:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4163:4169 -> a
+    17032:17034:void lambda$addConsequentRootSet$111(com.android.tools.r8.graph.DexType,java.util.Set):4171:4173 -> a
+    17035:17039:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):932:936 -> a
+    17035:17039:void lambda$addConsequentRootSet$111(com.android.tools.r8.graph.DexType,java.util.Set):4174 -> a
+    17040:17047:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4195:4202 -> a
+    17048:17051:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4201:4204 -> a
+    17052:17052:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4203:4203 -> a
+    17053:17060:void retainAnnotationForFinalTreeShaking(java.util.List):4223:4230 -> a
+    17061:17061:void retainAnnotationForFinalTreeShaking(java.util.List):4227:4227 -> a
+    17062:17065:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4262:4265 -> a
+    17066:17072:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4337:4343 -> a
+    17073:17073:com.android.tools.r8.shaking.Enqueuer$Mode getMode():515:515 -> a
+    17073:17073:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4397 -> a
+    17073:17073:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
+    17074:17074:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4397:4397 -> a
+    17074:17074:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
+    17075:17075:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3627:3627 -> a
+    17075:17075:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4398 -> a
+    17075:17075:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
+    17076:17078:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3621:3623 -> a
+    17076:17078:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3628 -> a
+    17076:17078:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4398 -> a
+    17076:17078:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
+    17079:17094:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3630:3645 -> a
+    17079:17094:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4398 -> a
+    17079:17094:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
+    17095:17095:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4403:4403 -> a
+    17095:17095:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4346 -> a
+    17096:17100:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4348:4352 -> a
+    17101:17101:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    17101:17101:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4352 -> a
+    17102:17102:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    17102:17102:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4354 -> a
+    17103:17103:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4354:4354 -> a
+    17104:17104:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    17104:17104:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4355 -> a
+    17105:17110:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4355:4360 -> a
+    17111:17111:void lambda$markMethodAsLive$112(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4360:4360 -> a
+    17112:17112:void lambda$markMethodAsTargeted$113(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4380:4380 -> a
+    17113:17113:void lambda$traceMethodDefinitionExcludingCode$114(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4390:4390 -> a
+    17114:17114:void lambda$traceCode$115(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4411:4411 -> a
+    17115:17115:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4437:4437 -> a
+    17116:17131:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4461:4476 -> a
+    17116:17131:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4439 -> a
+    17132:17132:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4443:4443 -> a
+    17133:17133:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    17133:17133:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4444 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    17134:17134:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    17134:17134:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4444 -> a
+    17135:17139:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4445:4449 -> a
+    17140:17140:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> a
+    17140:17140:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():794 -> a
+    17140:17140:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4450 -> a
+    17141:17145:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4451:4455 -> a
+    17146:17146:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4452:4452 -> a
+    17147:17153:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4494:4500 -> a
+    17154:17161:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4604:4611 -> a
+    17154:17161:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17162:17164:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4610:4612 -> a
+    17162:17164:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17165:17165:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
+    17165:17165:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4618 -> a
+    17165:17165:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17166:17166:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4622:4622 -> a
+    17166:17166:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17167:17167:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17167:17167:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4624 -> a
+    17167:17167:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17168:17168:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4427:4427 -> a
+    17168:17168:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625 -> a
+    17168:17168:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17169:17169:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> a
+    17169:17169:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():794 -> a
+    17169:17169:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4428 -> a
+    17169:17169:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625 -> a
+    17169:17169:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17170:17172:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4429:4431 -> a
+    17170:17172:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625 -> a
+    17170:17172:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17173:17173:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4430:4430 -> a
+    17173:17173:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4625 -> a
+    17173:17173:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17174:17177:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4626:4629 -> a
+    17174:17177:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17178:17178:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17178:17178:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
+    17178:17178:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4628 -> a
+    17178:17178:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17179:17179:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
+    17179:17179:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4628 -> a
+    17179:17179:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4501 -> a
+    17180:17180:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4504:4504 -> a
+    17181:17202:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4636:4657 -> a
+    17181:17202:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17203:17205:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4656:4658 -> a
     17203:17205:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17206:17206:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4430:4430 -> a
-    17206:17206:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728 -> a
+    17206:17206:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
+    17206:17206:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4664 -> a
     17206:17206:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17207:17210:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4729:4732 -> a
-    17207:17210:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17211:17211:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    17211:17211:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
-    17211:17211:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4731 -> a
-    17211:17211:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17212:17212:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
-    17212:17212:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4731 -> a
-    17212:17212:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
-    17213:17213:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4508:4508 -> a
-    17214:17217:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4809:4812 -> a
-    17214:17217:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4509 -> a
-    17218:17218:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
-    17218:17218:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4813 -> a
-    17218:17218:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4509 -> a
-    17219:17219: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
-    17219:17219:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
-    17219:17219:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4813 -> a
-    17219:17219:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4509 -> a
-    17220:17220:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4813:4813 -> a
-    17220:17220:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4509 -> a
-    17221:17225:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4512:4516 -> a
-    17226:17226:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2208:2208 -> a
-    17226:17226:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4516 -> a
+    17207:17208:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4668:4669 -> a
+    17207:17208:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17209:17209:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    17209:17209:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4669 -> a
+    17209:17209:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17210:17258:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4674:4722 -> a
+    17210:17258:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17259:17259:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17259:17259:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4727 -> a
+    17259:17259:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17260:17260:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4427:4427 -> a
+    17260:17260:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728 -> a
+    17260:17260:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17261:17261:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> a
+    17261:17261:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():794 -> a
+    17261:17261:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4428 -> a
+    17261:17261:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728 -> a
+    17261:17261:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17262:17264:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4429:4431 -> a
+    17262:17264:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728 -> a
+    17262:17264:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17265:17265:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4430:4430 -> a
+    17265:17265:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4728 -> a
+    17265:17265:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17266:17269:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4729:4732 -> a
+    17266:17269:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17270:17270:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17270:17270:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
+    17270:17270:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4731 -> a
+    17270:17270:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17271:17271:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
+    17271:17271:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4731 -> a
+    17271:17271:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4505 -> a
+    17272:17272:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4508:4508 -> a
+    17273:17276:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4809:4812 -> a
+    17273:17276:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4509 -> a
+    17277:17277:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    17277:17277:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4813 -> a
+    17277:17277:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4509 -> a
+    17278:17278: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
+    17278:17278:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
+    17278:17278:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4813 -> a
+    17278:17278:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4509 -> a
+    17279:17279:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4813:4813 -> a
+    17279:17279:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4509 -> a
+    17280:17284:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4512:4516 -> a
+    17285:17285:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2206:2206 -> a
+    17285:17285:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4516 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17227:17227:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2208:2208 -> a
-    17227:17227:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4516 -> a
-    17228:17234:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4819:4825 -> a
-    17228:17234:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17235:17235:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    17235:17235:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4825 -> a
-    17235:17235:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17236:17240:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4826:4830 -> a
-    17236:17240:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17241:17241:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":17330,"2":17331,"3":17332}}
-    17330:17330:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4830:4830 -> a
-    17330:17330:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17331:17331:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4830:4830 -> a
-    17331:17331:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17332:17332:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4830:4830 -> a
-    17332:17332:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17242:17242:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":17335,"2":17336,"3":17337}}
-    17335:17335:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4833:4833 -> a
-    17335:17335:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17336:17336:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4833:4833 -> a
-    17336:17336:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17337:17337:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4833:4833 -> a
-    17337:17337:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17243:17245:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4835:4837 -> a
-    17243:17245:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17246:17246:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4830:4830 -> a
-    17246:17246:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17247:17247:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17247:17247:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4842 -> a
-    17247:17247:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17248:17248:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4842:4842 -> a
-    17248:17248:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17249:17249:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17249:17249:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4844 -> a
-    17249:17249:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17250:17251:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4845:4846 -> a
-    17250:17251:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
-    17252:17261:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4520:4529 -> a
-    17262:17262:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    17262:17262:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4529 -> a
-    17263:17267:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4530:4534 -> a
-    17268:17268:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
-    17268:17268:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4534 -> a
-    17269:17269:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17269:17269:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4538 -> a
-    17270:17270:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4538:4538 -> a
-    17271:17271:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():660:660 -> a
-    17271:17271:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4539 -> a
-    17272:17272:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    17272:17272:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():660 -> a
-    17272:17272:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4539 -> a
-    17273:17273:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():660:660 -> a
-    17273:17273:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4539 -> a
-    17274:17287:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4539:4552 -> a
-    17288:17288:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
-    17288:17288:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4552 -> a
-    17289:17302:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4556:4569 -> a
-    17303:17303:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17303:17303:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4570 -> a
-    17304:17309:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4569:4574 -> a
-    17310:17310:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17310:17310:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4576 -> a
-    17311:17316:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4576:4581 -> a
-    17317:17317:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
-    17317:17317:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4582 -> a
-    17318:17318:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4586:4586 -> a
-    17319:17319:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    17319:17319:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4590 -> a
-    17320:17327:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4591:4598 -> a
-    17328:17328:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    17328:17328:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
-    17328:17328:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4597 -> a
-    17329:17329:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
-    17329:17329:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4597 -> a
-    17338:17338:void lambda$handleReflectiveBehavior$118(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4575:4575 -> a
-    17339:17339:void lambda$handleJavaLangReflectProxyNewProxyInstance$119(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4779:4779 -> a
-    17340:17342:void lambda$handleJavaLangReflectProxyNewProxyInstance$121(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4787:4789 -> a
-    17343:17343:void lambda$handleJavaLangReflectProxyNewProxyInstance$120(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4788:4788 -> a
-    17344:17354:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4853:4863 -> a
-    17355:17355:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4427:4427 -> a
-    17355:17355:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4868 -> a
-    17356:17356:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> a
-    17356:17356:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():794 -> a
-    17356:17356:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4428 -> a
-    17356:17356:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4868 -> a
-    17357:17359:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4429:4431 -> a
-    17357:17359:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4868 -> a
-    17360:17360:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4430:4430 -> a
-    17360:17360:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4868 -> a
-    17361:17364:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4870:4873 -> a
-    17365:17365:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    17365:17365:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
-    17365:17365:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4872 -> a
-    17366:17366:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
-    17366:17366:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4872 -> a
-    17367:17370:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4876:4879 -> a
-    17371:17371:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4878:4878 -> a
-    17372:17372:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):413:413 -> a
-    17372:17372:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4878 -> a
-    17373:17373:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4883:4883 -> a
-    17374:17374:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    17374:17374:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
-    17374:17374:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4882 -> a
-    17375:17375:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
-    17375:17375:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4882 -> a
-    17376:17385:com.android.tools.r8.utils.collections.DexMethodSignatureSet getServiceMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):4890:4899 -> a
+    17286:17286:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2206:2206 -> a
+    17286:17286:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4516 -> a
+    17287:17293:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4819:4825 -> a
+    17287:17293:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17294:17294:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    17294:17294:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4825 -> a
+    17294:17294:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17295:17299:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4826:4830 -> a
+    17295:17299:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17300:17300:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":17389,"2":17390,"3":17391}}
+    17389:17389:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4830:4830 -> a
+    17389:17389:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17390:17390:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4830:4830 -> a
+    17390:17390:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17391:17391:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4830:4830 -> a
+    17391:17391:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17301:17301:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":17394,"2":17395,"3":17396}}
+    17394:17394:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4833:4833 -> a
+    17394:17394:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17395:17395:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4833:4833 -> a
+    17395:17395:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17396:17396:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4833:4833 -> a
+    17396:17396:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17302:17304:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4835:4837 -> a
+    17302:17304:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17305:17305:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4830:4830 -> a
+    17305:17305:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17306:17306:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17306:17306:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4842 -> a
+    17306:17306:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17307:17307:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4842:4842 -> a
+    17307:17307:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17308:17308:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17308:17308:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4844 -> a
+    17308:17308:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17309:17310:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4845:4846 -> a
+    17309:17310:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4517 -> a
+    17311:17320:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4520:4529 -> a
+    17321:17321:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    17321:17321:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4529 -> a
+    17322:17326:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4530:4534 -> a
+    17327:17327:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
+    17327:17327:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4534 -> a
+    17328:17328:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17328:17328:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4538 -> a
+    17329:17329:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4538:4538 -> a
+    17330:17330:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():660:660 -> a
+    17330:17330:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4539 -> a
+    17331:17331:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
+    17331:17331:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():660 -> a
+    17331:17331:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4539 -> a
+    17332:17332:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():660:660 -> a
+    17332:17332:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4539 -> a
+    17333:17346:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4539:4552 -> a
+    17347:17347:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
+    17347:17347:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4552 -> a
+    17348:17361:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4556:4569 -> a
+    17362:17362:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17362:17362:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4570 -> a
+    17363:17368:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4569:4574 -> a
+    17369:17369:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17369:17369:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4576 -> a
+    17370:17375:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4576:4581 -> a
+    17376:17376:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):792:792 -> a
+    17376:17376:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4582 -> a
+    17377:17377:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4586:4586 -> a
+    17378:17378:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17378:17378:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4590 -> a
+    17379:17386:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4591:4598 -> a
+    17387:17387:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17387:17387:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
+    17387:17387:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4597 -> a
+    17388:17388:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
+    17388:17388:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4597 -> a
+    17397:17397:void lambda$handleReflectiveBehavior$118(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):4575:4575 -> a
+    17398:17398:void lambda$handleJavaLangReflectProxyNewProxyInstance$119(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4779:4779 -> a
+    17399:17401:void lambda$handleJavaLangReflectProxyNewProxyInstance$121(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4787:4789 -> a
+    17402:17402:void lambda$handleJavaLangReflectProxyNewProxyInstance$120(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):4788:4788 -> a
+    17403:17413:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4853:4863 -> a
+    17414:17414:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4427:4427 -> a
+    17414:17414:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4868 -> a
+    17415:17415:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> a
+    17415:17415:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():794 -> a
+    17415:17415:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4428 -> a
+    17415:17415:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4868 -> a
+    17416:17418:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4429:4431 -> a
+    17416:17418:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4868 -> a
+    17419:17419:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4430:4430 -> a
+    17419:17419:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4868 -> a
+    17420:17423:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4870:4873 -> a
+    17424:17424:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17424:17424:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
+    17424:17424:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4872 -> a
+    17425:17425:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
+    17425:17425:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4872 -> a
+    17426:17429:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4876:4879 -> a
+    17430:17430:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4878:4878 -> a
+    17431:17431:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):413:413 -> a
+    17431:17431:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4878 -> a
+    17432:17432:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4883:4883 -> a
+    17433:17433:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17433:17433:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433 -> a
+    17433:17433:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4882 -> a
+    17434:17434:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3433:3433 -> a
+    17434:17434:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4882 -> a
+    17435:17444:com.android.tools.r8.utils.collections.DexMethodSignatureSet getServiceMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):4890:4899 -> a
     com.android.tools.r8.graph.DexApplication lambda$synthesize$97(com.android.tools.r8.graph.DexApplication) -> b
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.ProgramMethod):79:79 -> b
     1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3189 -> b
@@ -110507,137 +110161,119 @@
     1753:1753:void lambda$traceStaticFieldRead$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1654 -> b
     1757:1757:java.lang.Boolean lambda$traceStaticFieldWrite$35(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1716:1716 -> b
     1758:1758:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$45(com.android.tools.r8.graph.DexType):1970:1970 -> b
-    1759:1759:void lambda$ensureMethodsContinueToWidenAccess$47(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1981:1981 -> b
-    1760:1794:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1986:2020 -> b
-    1795:1795:boolean com.android.tools.r8.graph.DexClass.isPublic():741:741 -> b
-    1795:1795:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2022 -> b
-    1796:1796:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2023:2023 -> b
-    1797:1797:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> b
-    1797:1797:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2026 -> b
-    1798:1798:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2024:2024 -> b
-    1799:1799:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> b
-    1799:1799:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1994 -> b
-    1800:1803: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):2121:2124 -> b
-    1804:1810: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):2123:2129 -> b
-    1811:1813:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2389:2391 -> b
-    1814:1818:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):701:705 -> b
-    1814:1818:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2390 -> b
-    1819:1819:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2511:2511 -> b
-    1820:1820:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> b
-    1820:1820:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2511 -> b
+    1759:1762: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):2121:2124 -> b
+    1763:1769: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):2123:2129 -> b
+    1770:1772:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2389:2391 -> b
+    1773:1777:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):701:705 -> b
+    1773:1777:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2390 -> b
+    1778:1778:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2511:2511 -> b
+    1779:1779:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> b
+    1779:1779:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2511 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1821:1821:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> b
-    1821:1821:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2511 -> b
-    1822:1827:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2511:2516 -> b
-    1828:1829:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2764:2765 -> b
-    1828:1829:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517 -> b
-    1830:1832:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2857:2859 -> b
-    1833:1833:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2858:2858 -> b
-    1834:1835:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> b
-    1834:1835:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2858 -> b
-    1836:1842:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2860:2866 -> b
-    1843:1843:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878:2878 -> b
-    1843:1843:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
-    1844:1844:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> b
-    1844:1844:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878 -> b
-    1844:1844:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
-    1845:1845:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2879:2879 -> b
-    1845:1845:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
-    1846:1846:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2043:2043 -> b
-    1846:1846:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> b
-    1846:1846:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
-    1847:1847:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> b
-    1847:1847:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2044 -> b
-    1847:1847:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> b
-    1847:1847:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
-    1848:1848:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049:2049 -> b
-    1848:1848:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> b
-    1848:1848:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> b
-    1848:1848:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
-    1849:1850:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2054:2055 -> b
-    1849:1850:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049 -> b
-    1849:1850:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> b
-    1849:1850:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> b
-    1849:1850:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
-    1851:1851:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2874:2874 -> b
-    1852:1852:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2868:2868 -> b
-    1853:1854:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2887:2888 -> b
-    1853:1854:void lambda$traceInstanceFieldWrite$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1587 -> b
-    1855:1855:void lambda$traceInstanceFieldWrite$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1588:1588 -> b
-    1856:1856:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2914:2914 -> b
-    1857:1857:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2923:2923 -> b
-    1858:1858:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2989:2989 -> b
-    1859:1859:boolean lambda$markVirtualMethodAsReachable$74(com.android.tools.r8.graph.DexDefinition):3111:3111 -> b
-    1860:1860: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):160:160 -> b
-    1860:1860:boolean lambda$markVirtualMethodAsReachable$74(com.android.tools.r8.graph.DexDefinition):3111 -> b
+    1780:1780:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> b
+    1780:1780:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2511 -> b
+    1781:1786:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2511:2516 -> b
+    1787:1788:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2764:2765 -> b
+    1787:1788:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2517 -> b
+    1789:1791:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2857:2859 -> b
+    1792:1792:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2858:2858 -> b
+    1793:1794:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> b
+    1793:1794:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2858 -> b
+    1795:1801:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2860:2866 -> b
+    1802:1802:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878:2878 -> b
+    1802:1802:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
+    1803:1803:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> b
+    1803:1803:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2878 -> b
+    1803:1803:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
+    1804:1804:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2879:2879 -> b
+    1804:1804:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
+    1805:1805:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2043:2043 -> b
+    1805:1805:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> b
+    1805:1805:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
+    1806:1806:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> b
+    1806:1806:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2044 -> b
+    1806:1806:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> b
+    1806:1806:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
+    1807:1807:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049:2049 -> b
+    1807:1807:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> b
+    1807:1807:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> b
+    1807:1807:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
+    1808:1809:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2054:2055 -> b
+    1808:1809:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2049 -> b
+    1808:1809:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2041 -> b
+    1808:1809:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):2880 -> b
+    1808:1809:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2872 -> b
+    1810:1810:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2874:2874 -> b
+    1811:1811:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2868:2868 -> b
+    1812:1813:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2887:2888 -> b
+    1812:1813:void lambda$traceInstanceFieldWrite$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1587 -> b
+    1814:1814:void lambda$traceInstanceFieldWrite$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1588:1588 -> b
+    1815:1823:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2892:2900 -> b
+    1824:1826:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1760:1762 -> b
+    1824:1826:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2900 -> b
+    1827:1827:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2901:2901 -> b
+    1828:1828:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2914:2914 -> b
+    1829:1829:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2923:2923 -> b
+    1830:1830:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2989:2989 -> b
+    1831:1831:boolean lambda$markVirtualMethodAsReachable$74(com.android.tools.r8.graph.DexDefinition):3111:3111 -> b
+    1832:1832: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):160:160 -> b
+    1832:1832:boolean lambda$markVirtualMethodAsReachable$74(com.android.tools.r8.graph.DexDefinition):3111 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1861:1861: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):160:160 -> b
-    1861:1861:boolean lambda$markVirtualMethodAsReachable$74(com.android.tools.r8.graph.DexDefinition):3111 -> b
-    1862:1866:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3163:3167 -> b
-    1862:1866:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
-    1867:1867:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1884,"2":1885,"3":1886}}
-    1884:1884:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3167:3167 -> b
-    1884:1884:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
-    1885:1885:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3167:3167 -> b
-    1885:1885:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
-    1886:1886:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3167:3167 -> b
-    1886:1886:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
-    1868:1868:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3167:3167 -> b
-    1868:1868:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
-    1869:1874:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3166:3171 -> b
-    1869:1874:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
-    1875:1880:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175:3180 -> b
-    1881:1881:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354:2354 -> b
-    1881:1881:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3183 -> b
-    1882:1882:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> b
-    1882:1882:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354 -> b
+    1833:1833: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):160:160 -> b
+    1833:1833:boolean lambda$markVirtualMethodAsReachable$74(com.android.tools.r8.graph.DexDefinition):3111 -> b
+    1834:1838:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3163:3167 -> b
+    1834:1838:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
+    1839:1839:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1856,"2":1857,"3":1858}}
+    1856:1856:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3167:3167 -> b
+    1856:1856:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
+    1857:1857:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3167:3167 -> b
+    1857:1857:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
+    1858:1858:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3167:3167 -> b
+    1858:1858:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
+    1840:1840:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3167:3167 -> b
+    1840:1840:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
+    1841:1846:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3166:3171 -> b
+    1841:1846:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175 -> b
+    1847:1852:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3175:3180 -> b
+    1853:1853:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354:2354 -> b
+    1853:1853:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3183 -> b
+    1854:1854:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> b
+    1854:1854:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2354 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1882:1882:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3183 -> b
-    1883:1883:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2355:2355 -> b
-    1883:1883:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3183 -> b
-    1887:1887:void lambda$markEnumValuesAsReachable$81(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3182:3182 -> b
-    1888:1898:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3238:3248 -> b
-    1899:1899:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():216:216 -> b
-    1899:1899:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3248 -> b
-    1900:1903:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3249:3252 -> b
-    1904:1904:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():224:224 -> b
-    1904:1904:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3252 -> b
-    1905:1909:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3251:3255 -> b
-    1910:1910:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):406:406 -> b
-    1910:1910:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3256 -> b
-    1911:1911:void lambda$applyMinimumKeepInfoWhenLive$89(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3340:3340 -> b
-    1912:1912:void lambda$applyMinimumKeepInfoWhenLive$91(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3389:3389 -> b
-    1913:1913:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$93(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3441:3441 -> b
-    1914:1914:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3454:3454 -> b
-    1915:1915:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> b
-    1915:1915:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3455 -> b
+    1854:1854:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3183 -> b
+    1855:1855:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2355:2355 -> b
+    1855:1855:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3183 -> b
+    1859:1859:void lambda$markEnumValuesAsReachable$81(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3182:3182 -> b
+    1860:1870:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3238:3248 -> b
+    1871:1871:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():216:216 -> b
+    1871:1871:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3248 -> b
+    1872:1875:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3249:3252 -> b
+    1876:1876:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():224:224 -> b
+    1876:1876:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3252 -> b
+    1877:1881:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3251:3255 -> b
+    1882:1882:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):406:406 -> b
+    1882:1882:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3256 -> b
+    1883:1883:void lambda$traceApplication$85(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3291:3291 -> b
+    1884:1884:void lambda$traceApplication$86(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3293:3293 -> b
+    1885:1885:void lambda$applyMinimumKeepInfoWhenLive$89(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3340:3340 -> b
+    1886:1886:void lambda$applyMinimumKeepInfoWhenLive$91(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3389:3389 -> b
+    1887:1887:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$93(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3441:3441 -> b
+    1888:1893:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3469:3474 -> b
+    1894:1894:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> b
+    1894:1894:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3474 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1916:1916:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> b
-    1916:1916:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3455 -> b
-    1917:1917:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3456:3456 -> b
-    1918:1920:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):902:904 -> b
-    1918:1920:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> b
-    1921:1921:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> b
-    1921:1921:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):907 -> b
+    1895:1895:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> b
+    1895:1895:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1921:1921:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> b
-    1922:1922:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):907:907 -> b
-    1922:1922:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> b
-    1923:1923:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):906:906 -> b
-    1923:1923:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> b
-    1924:1924:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):904:904 -> b
-    1924:1924:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3457 -> b
-    1925:1925:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3459:3459 -> b
-    1926:1926:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> b
-    1926:1926:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3460 -> b
-    1927:1928:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2036:2037 -> b
-    1927:1928:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3460 -> b
-    1929:1929:void lambda$applyMinimumKeepInfoDependentOn$94(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3489:3489 -> b
-    1930:1930:void lambda$applyMinimumKeepInfoDependentOn$95(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3491:3491 -> b
-    1931:1933:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3730:3732 -> b
-    1934:1938:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4485:4489 -> b
-    1939:1939:void lambda$handleReflectiveBehavior$117(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4548:4548 -> b
+    1895:1895:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3474 -> b
+    1896:1896:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3477:3477 -> b
+    1897:1897:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> b
+    1897:1897:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3477 -> b
+    1898:1898:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3478:3478 -> b
+    1899:1901:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3730:3732 -> b
+    1902:1906:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4485:4489 -> b
+    1907:1907:void lambda$handleReflectiveBehavior$117(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4548:4548 -> b
     1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1800(com.android.tools.r8.shaking.Enqueuer):193:193 -> c
     2:2:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):550:550 -> c
     3:4:void setInitialPrunedTypes(java.util.Set):574:575 -> c
@@ -110660,16 +110296,16 @@
     22:22:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1286 -> c
     23:23:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1286:1286 -> c
     24:25:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1351:1352 -> c
-    26:26:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> c
+    26:26:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> c
     26:26:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1352 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:27:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1628:1628 -> c
+    27:27:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1626:1626 -> c
     27:27:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1352 -> c
     28:40:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1352:1364 -> c
-    41:41:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2208:2208 -> c
+    41:41:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2206:2206 -> c
     41:41:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1364 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:42:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2208:2208 -> c
+    42:42:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2206:2206 -> c
     42:42:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1364 -> c
     43:53:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1365:1375 -> c
     54:54:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
@@ -110730,37 +110366,106 @@
     4314:4315:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2887:2888 -> c
     4314:4315:void lambda$traceStaticFieldRead$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1658 -> c
     4316:4318:void lambda$traceStaticFieldRead$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1659:1661 -> c
-    4319:4327:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2892:2900 -> c
-    4328:4330:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1760:1762 -> c
-    4328:4330:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2900 -> c
-    4331:4331:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2901:2901 -> c
-    4332:4333:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2931:2932 -> c
-    4334:4334:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2993:2993 -> c
-    4335:4335:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2989:2989 -> c
-    4335:4335:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2993 -> c
-    4336:4336:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):3003:3003 -> c
-    4337:4337:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$83(com.android.tools.r8.graph.DexEncodedMethod):3224:3224 -> c
-    4338:4338:void lambda$traceApplication$85(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3291:3291 -> c
-    4339:4339:void lambda$traceApplication$86(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3293:3293 -> c
-    4340:4340:void lambda$applyMinimumKeepInfoDependentOn$96(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3493:3493 -> c
-    4341:4347:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3919:3925 -> c
-    4348:4359:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3955:3966 -> c
-    4348:4359:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3925 -> c
-    4360:4360:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2989:2989 -> c
-    4360:4360:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3967 -> c
-    4360:4360:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3925 -> c
-    4361:4361:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3968:3968 -> c
-    4361:4361:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3925 -> c
-    4362:4364:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3977:3979 -> c
-    4362:4364:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3968 -> c
-    4362:4364:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3925 -> c
-    4365:4365:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4180:4180 -> c
-    4366:4366: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):2037:2037 -> c
-    4366:4366:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4180 -> c
-    4367:4368:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4181:4182 -> c
-    4369:4378:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4210:4219 -> c
-    4369:4378:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4183 -> c
-    4379:4379:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4187:4187 -> c
+    4319:4320:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2931:2932 -> c
+    4321:4321:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2993:2993 -> c
+    4322:4322:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2989:2989 -> c
+    4322:4322:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):2993 -> c
+    4323:4323:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):3003:3003 -> c
+    4324:4324:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$83(com.android.tools.r8.graph.DexEncodedMethod):3224:3224 -> c
+    4325:4330:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3364:3369 -> c
+    4331:4331:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> c
+    4331:4331:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3369 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4332:4332:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> c
+    4332:4332:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4332:4332:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3369 -> c
+    4333:4333:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3371:3371 -> c
+    4334:4334:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
+    4334:4334:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3371 -> c
+    4335:4335:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3353:3353 -> c
+    4335:4335:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> c
+    4336:4336:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> c
+    4336:4336:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4336:4336:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> c
+    4337:4337:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> c
+    4337:4337:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> c
+    4337:4337:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> c
+    4338:4338:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3355:3355 -> c
+    4338:4338:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> c
+    4339:4340:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:859 -> c
+    4339:4340:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> c
+    4339:4340:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> c
+    4341:4341:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> c
+    4341:4341:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4341:4341:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> c
+    4341:4341:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> c
+    4342:4342:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> c
+    4342:4342:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> c
+    4342:4342:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> c
+    4343:4348:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3409:3414 -> c
+    4349:4349:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> c
+    4349:4349:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3414 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4350:4350:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> c
+    4350:4350:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4350:4350:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3414 -> c
+    4351:4351:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3416:3416 -> c
+    4352:4352:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> c
+    4352:4352:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3416 -> c
+    4353:4353:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3400:3400 -> c
+    4353:4353:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4354:4354:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> c
+    4354:4354:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4354:4354:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4355:4355:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> c
+    4355:4355:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> c
+    4355:4355:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4356:4356:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3402:3402 -> c
+    4356:4356:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4357:4359:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):890:892 -> c
+    4357:4359:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> c
+    4357:4359:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4360:4360:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> c
+    4360:4360:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4360:4360:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> c
+    4360:4360:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4361:4361:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> c
+    4361:4361:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> c
+    4361:4361:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4362:4362:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):894:894 -> c
+    4362:4362:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> c
+    4362:4362:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4363:4363:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> c
+    4363:4363:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> c
+    4363:4363:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> c
+    4364:4370:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3919:3925 -> c
+    4371:4382:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3955:3966 -> c
+    4371:4382:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3925 -> c
+    4383:4383:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2989:2989 -> c
+    4383:4383:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3967 -> c
+    4383:4383:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3925 -> c
+    4384:4384:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3968:3968 -> c
+    4384:4384:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3925 -> c
+    4385:4387:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3977:3979 -> c
+    4385:4387:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3968 -> c
+    4385:4387:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3925 -> c
+    4388:4388:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4180:4180 -> c
+    4389:4389: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):2037:2037 -> c
+    4389:4389:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4180 -> c
+    4390:4391:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4181:4182 -> c
+    4392:4401:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4210:4219 -> c
+    4392:4401:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4183 -> c
+    4402:4402:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4187:4187 -> c
+    4403:4416:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4237:4250 -> c
+    4417:4418:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> c
+    4417:4418:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4250 -> c
+    4419:4422:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4253:4256 -> 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):1321 -> 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
@@ -110771,137 +110476,60 @@
     4:4:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$116(com.android.tools.r8.graph.ProgramMethod):4541 -> d
     5:5:com.android.tools.r8.utils.InternalOptions access$2000(com.android.tools.r8.shaking.Enqueuer):193:193 -> d
     6:10:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():523:527 -> d
-    11:11:void lambda$traceSafeCheckCast$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1089:1089 -> d
-    12:23:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1179:1190 -> d
-    24:30:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1227:1233 -> d
-    24:30:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1190 -> d
-    31:35:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1189:1193 -> d
-    36:36:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> d
-    36:36:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1197 -> d
-    37:37:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202:1202 -> d
-    38:42:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1227:1231 -> d
-    38:42:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202 -> d
-    43:43:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1205:1205 -> d
-    44:44:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> d
-    44:44:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1205 -> d
-    45:48:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1205:1208 -> d
-    49:49:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> d
-    49:49:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1212 -> d
-    50:50:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1217:1217 -> d
-    51:51:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> d
-    51:51:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1221 -> d
-    52:52:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1221:1221 -> d
-    53:53:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> d
-    53:53:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1222 -> d
-    54:54:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1222:1222 -> d
-    55:55:void lambda$traceInvokeSuper$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1393:1393 -> d
-    56:63:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1406:1413 -> d
-    64:76:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1408:1420 -> d
-    77:77:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    77:77:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1420 -> d
-    78:79:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1422:1423 -> d
-    80:80:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1463:1463 -> d
-    81:81:void lambda$traceStaticFieldWrite$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1687:1687 -> d
-    82:90:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1772:1780 -> d
-    91:91:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> d
-    91:91:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1784 -> d
-    92:92:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$39(com.android.tools.r8.graph.DexType):1896:1896 -> d
-    93:94:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2887:2888 -> d
-    93:94:void lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1736 -> d
-    95:95:void lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1737:1737 -> d
-    96:100:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2942:2946 -> d
-    101:101:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> d
-    101:101:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2946 -> d
-    102:103:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2948:2949 -> d
-    104:109:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3364:3369 -> d
-    110:110:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
-    110:110:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3369 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    111:111:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> d
-    111:111:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    111:111:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3369 -> d
-    112:112:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3371:3371 -> d
-    113:113:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
-    113:113:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3371 -> d
-    114:114:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3353:3353 -> d
-    114:114:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> d
-    115:115:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> d
-    115:115:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    115:115:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> d
-    116:116:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> d
-    116:116:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3354 -> d
-    116:116:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> d
-    117:117:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3355:3355 -> d
-    117:117:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> d
-    118:119:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:859 -> d
-    118:119:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> d
-    118:119:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> d
-    120:120:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> d
-    120:120:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    120:120:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> d
-    120:120:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> d
-    121:121:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> d
-    121:121:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3356 -> d
-    121:121:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3372 -> d
-    122:127:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3409:3414 -> d
-    128:128:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
-    128:128:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3414 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    129:129:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> d
-    129:129:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    129:129:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3414 -> d
-    130:130:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3416:3416 -> d
-    131:131:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
-    131:131:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3416 -> d
-    132:132:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3400:3400 -> d
-    132:132:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    133:133:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> d
-    133:133:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    133:133:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    134:134:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():480:480 -> d
-    134:134:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3401 -> d
-    134:134:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    135:135:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3402:3402 -> d
-    135:135:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    136:138:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):890:892 -> d
-    136:138:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> d
-    136:138:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    139:139:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> d
-    139:139:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    139:139:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> d
-    139:139:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    140:140:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):895:895 -> d
-    140:140:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> d
-    140:140:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    141:141:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):894:894 -> d
-    141:141:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> d
-    141:141:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    142:142:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):892:892 -> d
-    142:142:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3403 -> d
-    142:142:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3417 -> d
-    143:148:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3469:3474 -> d
-    149:149:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
-    149:149:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3474 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    150:150:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):549:549 -> d
-    150:150:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    150:150:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3474 -> d
-    151:151:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3477:3477 -> d
-    152:152:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
-    152:152:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3477 -> d
-    153:153:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3478:3478 -> d
-    154:157:java.util.Set lambda$createEnqueuerResult$104(com.android.tools.r8.graph.DexProgramClass):3825:3828 -> d
-    158:171:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4237:4250 -> d
-    172:173:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> d
-    172:173:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4250 -> d
-    174:177:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4253:4256 -> d
+    11:11:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):594:594 -> d
+    11:11:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4364 -> d
+    12:19:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4369:4376 -> d
+    20:21:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4480:4481 -> d
+    20:21:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4377 -> d
+    22:22:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):192:192 -> d
+    22:22:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4481 -> d
+    22:22:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4377 -> d
+    23:23:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4480:4480 -> d
+    23:23:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4377 -> d
+    24:24:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4380:4380 -> d
+    25:25:void lambda$traceSafeCheckCast$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1089:1089 -> d
+    26:37:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1179:1190 -> d
+    38:44:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1227:1233 -> d
+    38:44:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1190 -> d
+    45:49:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1189:1193 -> d
+    50:50:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> d
+    50:50:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1197 -> d
+    51:51:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202:1202 -> d
+    52:56:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1227:1231 -> d
+    52:56:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1202 -> d
+    57:57:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1205:1205 -> d
+    58:58:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> d
+    58:58:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1205 -> d
+    59:62:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1205:1208 -> d
+    63:63:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> d
+    63:63:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1212 -> d
+    64:64:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1217:1217 -> d
+    65:65:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> d
+    65:65:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1221 -> d
+    66:66:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1221:1221 -> d
+    67:67:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> d
+    67:67:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1222 -> d
+    68:68:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1222:1222 -> d
+    69:69:void lambda$traceInvokeSuper$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1393:1393 -> d
+    70:77:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1406:1413 -> d
+    78:90:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1408:1420 -> d
+    91:91:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    91:91:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1420 -> d
+    92:93:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1422:1423 -> d
+    94:94:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1463:1463 -> d
+    95:95:void lambda$traceStaticFieldWrite$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1687:1687 -> d
+    96:104:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1772:1780 -> d
+    105:105:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):1811:1811 -> d
+    105:105:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1784 -> d
+    106:106:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$39(com.android.tools.r8.graph.DexType):1896:1896 -> d
+    107:108:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):2887:2888 -> d
+    107:108:void lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1736 -> d
+    109:109:void lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1737:1737 -> d
+    110:114:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2942:2946 -> d
+    115:115:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():808:808 -> d
+    115:115:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2946 -> d
+    116:117:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2948:2949 -> d
+    118:121:java.util.Set lambda$createEnqueuerResult$104(com.android.tools.r8.graph.DexProgramClass):3825:3828 -> 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):1342 -> 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
@@ -110909,50 +110537,43 @@
     2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1342 -> e
     3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1342:1342 -> e
     4:4:com.android.tools.r8.shaking.Enqueuer$Mode access$300(com.android.tools.r8.shaking.Enqueuer):193:193 -> e
-    5:5:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):594:594 -> e
-    5:5:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4364 -> e
-    6:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4369:4376 -> e
-    14:15:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4480:4481 -> e
-    14:15:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4377 -> e
-    16:16:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):192:192 -> e
-    16:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4481 -> e
-    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4377 -> e
-    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4480:4480 -> e
-    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4377 -> e
-    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4380:4380 -> e
-    19:19:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):608:608 -> e
-    20:29:void enqueueAllIfNotShrinking():832:841 -> e
-    30:30:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269:269 -> e
-    30:30:void enqueueAllIfNotShrinking():841 -> e
-    31:31:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):265:265 -> e
-    31:31:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269 -> e
-    31:31:void enqueueAllIfNotShrinking():841 -> e
-    32:33:void enqueueAllIfNotShrinking():841:842 -> e
-    34:35:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:859 -> e
-    34:35:void enqueueAllIfNotShrinking():846 -> e
-    36:36:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> e
-    36:36:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> e
+    5:5:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):608:608 -> e
+    6:15:void enqueueAllIfNotShrinking():832:841 -> e
+    16:16:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269:269 -> e
+    16:16:void enqueueAllIfNotShrinking():841 -> e
+    17:17:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):265:265 -> e
+    17:17:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269 -> e
+    17:17:void enqueueAllIfNotShrinking():841 -> e
+    18:19:void enqueueAllIfNotShrinking():841:842 -> e
+    20:21:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):858:859 -> e
+    20:21:void enqueueAllIfNotShrinking():846 -> e
+    22:22:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():468:468 -> e
+    22:22:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:void enqueueAllIfNotShrinking():846 -> e
-    37:37:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> e
-    37:37:void enqueueAllIfNotShrinking():846 -> e
-    38:38:void enqueueAllIfNotShrinking():847:847 -> e
-    39:39:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> e
-    39:39:void enqueueAllIfNotShrinking():847 -> e
-    40:40:void enqueueAllIfNotShrinking():849:849 -> e
-    41:41:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1266:1266 -> e
-    42:42:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1262:1262 -> e
-    42:42:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1267 -> e
-    43:43:void lambda$traceInvokeVirtual$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1423:1423 -> e
-    44:44:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1467:1467 -> e
-    45:45:java.util.Map lambda$processAnnotation$49(com.android.tools.r8.graph.DexType):2071:2071 -> e
-    46:46:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$69(com.android.tools.r8.graph.DexProgramClass):2865:2865 -> e
-    47:47:void lambda$markDirectStaticOrConstructorMethodAsLive$71(com.android.tools.r8.graph.ProgramMethod):2896:2896 -> e
-    48:50:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1760:1762 -> e
-    48:50:void lambda$markDirectStaticOrConstructorMethodAsLive$71(com.android.tools.r8.graph.ProgramMethod):2896 -> e
-    51:51:void lambda$markDirectStaticOrConstructorMethodAsLive$71(com.android.tools.r8.graph.ProgramMethod):2897:2897 -> e
-    52:52:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1767:1767 -> e
-    52:52:void lambda$markDirectStaticOrConstructorMethodAsLive$71(com.android.tools.r8.graph.ProgramMethod):2897 -> e
+    22:22:void enqueueAllIfNotShrinking():846 -> e
+    23:23:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):860:860 -> e
+    23:23:void enqueueAllIfNotShrinking():846 -> e
+    24:24:void enqueueAllIfNotShrinking():847:847 -> e
+    25:25:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):199:199 -> e
+    25:25:void enqueueAllIfNotShrinking():847 -> e
+    26:26:void enqueueAllIfNotShrinking():849:849 -> e
+    27:27:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1266:1266 -> e
+    28:28:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1262:1262 -> e
+    28:28:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1267 -> e
+    29:29:void lambda$traceInvokeVirtual$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1423:1423 -> e
+    30:30:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1467:1467 -> e
+    31:31:java.util.Map lambda$processAnnotation$49(com.android.tools.r8.graph.DexType):2071:2071 -> e
+    32:32:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$69(com.android.tools.r8.graph.DexProgramClass):2865:2865 -> e
+    33:33:void lambda$markDirectStaticOrConstructorMethodAsLive$71(com.android.tools.r8.graph.ProgramMethod):2896:2896 -> e
+    34:36:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1760:1762 -> e
+    34:36:void lambda$markDirectStaticOrConstructorMethodAsLive$71(com.android.tools.r8.graph.ProgramMethod):2896 -> e
+    37:37:void lambda$markDirectStaticOrConstructorMethodAsLive$71(com.android.tools.r8.graph.ProgramMethod):2897:2897 -> e
+    38:38:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1767:1767 -> e
+    38:38:void lambda$markDirectStaticOrConstructorMethodAsLive$71(com.android.tools.r8.graph.ProgramMethod):2897 -> e
+    39:40:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2907:2908 -> e
+    41:41:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> e
+    41:41:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2909 -> e
+    42:45:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2907:2910 -> e
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.shaking.Enqueuer):193:193 -> f
     2:2:com.android.tools.r8.shaking.GraphReporter getGraphReporter():519:519 -> f
     3:3:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):598:598 -> f
@@ -110984,10 +110605,6 @@
     52:52:void lambda$markDirectStaticOrConstructorMethodAsLive$72(com.android.tools.r8.graph.ProgramMethod):2901:2901 -> f
     53:53:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1767:1767 -> f
     53:53:void lambda$markDirectStaticOrConstructorMethodAsLive$72(com.android.tools.r8.graph.ProgramMethod):2901 -> f
-    54:55:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2907:2908 -> f
-    56:56:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> f
-    56:56:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2909 -> f
-    57:60:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2907:2910 -> 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):1397 -> 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
@@ -111077,10 +110694,10 @@
     1:16:boolean addMethod(com.android.tools.r8.graph.DexMethod):5044:5059 -> a
     17:17:boolean addType(com.android.tools.r8.graph.DexType):5087:5087 -> a
     1:24:boolean addField(com.android.tools.r8.graph.DexField):5008:5031 -> b
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     25:25:boolean addField(com.android.tools.r8.graph.DexField):5031 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:26:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> b
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> b
     26:26:boolean addField(com.android.tools.r8.graph.DexField):5031 -> b
     27:32:boolean addField(com.android.tools.r8.graph.DexField):5031:5036 -> b
 com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.p:
@@ -111189,13 +110806,13 @@
     48:48:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3592:3592 -> a
     1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3552:3552 -> b
     1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3526:3526 -> c
-com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.li:
+com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.gi:
     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.gi:
+com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent -> com.android.tools.r8.internal.bi:
     com.android.tools.r8.graph.DexType clazz -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):82:83 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent() -> a
@@ -111204,7 +110821,7 @@
     2:2:com.android.tools.r8.graph.DexDefinition getDefinition(com.android.tools.r8.graph.DexDefinitionSupplier):88:88 -> a
     boolean isClassEvent() -> b
     1:1:com.android.tools.r8.graph.DexType getType():92:92 -> c
-com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com.android.tools.r8.internal.hi:
+com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com.android.tools.r8.internal.ci:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):156:156 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexType):160:160 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):175:175 -> a
@@ -111218,7 +110835,7 @@
     178:181:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):176:179 -> a
     1:3:boolean equals(java.lang.Object):187:189 -> equals
     1:1:int hashCode():196:196 -> hashCode
-com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android.tools.r8.internal.ii:
+com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android.tools.r8.internal.di:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):109:109 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexType):113:113 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):128:128 -> a
@@ -111232,13 +110849,13 @@
     131:134:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):129:132 -> a
     1:3:boolean equals(java.lang.Object):140:142 -> equals
     1:1:int hashCode():149:149 -> hashCode
-com.android.tools.r8.shaking.EnqueuerEvent$NoSuchEnqueuerEvent -> com.android.tools.r8.internal.ji:
+com.android.tools.r8.shaking.EnqueuerEvent$NoSuchEnqueuerEvent -> com.android.tools.r8.internal.ei:
     com.android.tools.r8.shaking.EnqueuerEvent$NoSuchEnqueuerEvent INSTANCE -> a
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:void <init>():61:61 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.shaking.EnqueuerEvent$NoSuchEnqueuerEvent get():64:64 -> c
-com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.internal.ki:
+com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.internal.fi:
     com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent INSTANCE -> a
     1:1:void <clinit>():202:202 -> <clinit>
     1:1:void <init>():204:204 -> <init>
@@ -111252,13 +110869,13 @@
     10:10: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 -> a
     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
-com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.ni:
+com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.ii:
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
 com.android.tools.r8.shaking.EnqueuerResult -> com.android.tools.r8.shaking.y:
     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.oi:
+com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.ji:
     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,com.android.tools.r8.androidapi.AndroidApiLevelCompute) -> a
 com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.U:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
@@ -111289,7 +110906,7 @@
     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.pi:
+com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.internal.ki:
     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.A:
@@ -111492,7 +111109,7 @@
     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.rk:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.mk:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -111511,7 +111128,7 @@
     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.Yl:
+com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Tl:
 com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.Z:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -111739,10 +111356,10 @@
     1:15: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.InlineRule$Type):75:89 -> <init>
     1:11:java.lang.String typeString():102:112 -> C
     12:12:java.lang.String typeString():0:0 -> C
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":136,"2":137,"3":138}}
-    136:136:java.lang.String typeString():112:112 -> C
-    137:137:java.lang.String typeString():112:112 -> C
-    138:138:java.lang.String typeString():112:112 -> C
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":129,"2":130,"3":131}}
+    129:129:java.lang.String typeString():112:112 -> C
+    130:130:java.lang.String typeString():112:112 -> C
+    131:131:java.lang.String typeString():112:112 -> C
     124:124:java.lang.String typeString():112:112 -> C
     125:125:java.lang.String typeString():110:110 -> C
     126:126:java.lang.String typeString():108:108 -> C
@@ -111754,7 +111371,7 @@
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):20:20 -> <init>
     2:2:void <init>():23:23 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.InlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.tp:
+com.android.tools.r8.shaking.InlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.mp:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -111782,7 +111399,7 @@
     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.iq:
+com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.bq:
     com.android.tools.r8.shaking.InstantiationReason NEW_INSTANCE_INSTRUCTION -> d
     com.android.tools.r8.shaking.InstantiationReason REFERENCED_IN_METHOD_HANDLE -> e
     com.android.tools.r8.shaking.InstantiationReason KEEP_RULE -> b
@@ -111951,7 +111568,7 @@
     3:3:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$1(com.android.tools.r8.graph.DexField):58:58 -> a
     4:4:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$2(com.android.tools.r8.graph.DexMethod):59:59 -> a
     5:5:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):103:103 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> a
     6:6:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):103 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:boolean internalIsMinificationAllowed():107:107 -> a
@@ -111981,22 +111598,22 @@
     20:20:boolean internalIsCheckDiscardedEnabled():83:83 -> a
     20:20:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):221 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():696:696 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():695:695 -> a
     21:21:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:22:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():697:697 -> a
+    22:22:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():696:696 -> a
     22:22:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160 -> a
     23:23:boolean internalIsAccessModificationAllowed():165:165 -> a
     23:23:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160 -> a
     1:1:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):117:117 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():624:624 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():623:623 -> b
     2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):117 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean internalIsOptimizationAllowed():121:121 -> b
     3:3:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):117 -> b
     4:4:boolean internalIsAccessModificationRequiredForRepackaging():148:148 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():634:634 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():609 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():633:633 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():608 -> b
     5:5:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):71 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     6:6:boolean internalIsAnnotationRemovalAllowed():75:75 -> b
@@ -112004,18 +111621,18 @@
     1:1:boolean internalIsAnnotationRemovalAllowed():75:75 -> c
     2:2:boolean isPinned(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):93:93 -> c
     3:3:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):189:189 -> c
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():634:634 -> c
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():633:633 -> c
     4:4:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):192 -> c
     5:5:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):192:192 -> c
     1:1:boolean internalIsCheckDiscardedEnabled():83:83 -> d
     2:2:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):131:131 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():614:614 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():613:613 -> d
     3:3:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):131 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalIsShrinkingAllowed():135:135 -> d
     4:4:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):131 -> d
     5:5:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):169:169 -> d
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():634:634 -> d
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():633:633 -> d
     6:6:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):172 -> d
     7:7:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):172:172 -> d
     1:1:boolean internalIsMinificationAllowed():107:107 -> e
@@ -112307,33 +111924,30 @@
     2:2:boolean internalIsInliningAllowed():99:99 -> g
     2:2:boolean isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):95 -> g
     1:3:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):103:105 -> h
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():702:702 -> h
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():701:701 -> h
     4:4:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):106 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():702:702 -> h
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():701:701 -> h
     5:5:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):106 -> h
     6:6:boolean internalIsMethodStaticizingAllowed():111:111 -> h
     6:6:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):107 -> h
     1:1:com.android.tools.r8.shaking.KeepMethodInfo access$200():7:7 -> i
-    2:4:boolean isParameterReorderingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):115:117 -> i
-    5:5:boolean internalIsParameterReorderingAllowed():122:122 -> i
-    5:5:boolean isParameterReorderingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):118 -> i
+    2:4:boolean isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):126:128 -> i
+    5:5:boolean internalIsParameterTypeStrengtheningAllowed():133:133 -> i
+    5:5:boolean isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):129 -> i
     1:1:com.android.tools.r8.shaking.KeepMethodInfo access$300():7:7 -> j
-    2:4:boolean isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):126:128 -> j
-    5:5:boolean internalIsParameterTypeStrengtheningAllowed():133:133 -> j
-    5:5:boolean isParameterTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):129 -> j
+    2:4:boolean isReturnTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):137:139 -> j
+    5:5:boolean internalIsReturnTypeStrengtheningAllowed():144:144 -> j
+    5:5:boolean isReturnTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):140 -> j
     1:1:com.android.tools.r8.shaking.KeepMethodInfo bottom():20:20 -> k
-    2:4:boolean isReturnTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):137:139 -> k
-    5:5:boolean internalIsReturnTypeStrengtheningAllowed():144:144 -> k
-    5:5:boolean isReturnTypeStrengtheningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):140 -> k
+    2:4:boolean isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):148:150 -> k
+    5:5:boolean internalIsUnusedArgumentOptimizationAllowed():155:155 -> k
+    5:5:boolean isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):151 -> k
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder builder():56:56 -> l
-    2:4:boolean isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):148:150 -> l
-    5:5:boolean internalIsUnusedArgumentOptimizationAllowed():155:155 -> l
-    5:5:boolean isUnusedArgumentOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):151 -> l
+    2:4:boolean isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):159:161 -> l
+    5:5:boolean internalIsUnusedReturnValueOptimizationAllowed():166:166 -> l
+    5:5:boolean isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):162 -> l
     1:1:boolean internalIsClassInliningAllowed():75:75 -> m
-    2:4:boolean isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):159:161 -> m
-    5:5:boolean internalIsUnusedReturnValueOptimizationAllowed():166:166 -> m
-    5:5:boolean isUnusedReturnValueOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):162 -> m
     1:1:boolean internalIsClosedWorldReasoningAllowed():83:83 -> n
     1:1:boolean internalIsConstantArgumentOptimizationAllowed():91:91 -> o
     1:1:boolean internalIsInliningAllowed():99:99 -> p
@@ -112621,7 +112235,7 @@
     1:11:com.android.tools.r8.shaking.KeepUnusedReturnValueRule build():29:39 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():15 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.rA:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.kA:
     java.util.List pruned -> b
     java.util.Set emulatedInterfaces -> a
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):29:29 -> <init>
@@ -112630,7 +112244,7 @@
     1:11:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.TypeRewriter):37:47 -> a
     12:26:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.TypeRewriter):44:58 -> a
     27:27:boolean lambda$prune$0(com.android.tools.r8.graph.DexType):52:52 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.vB:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.oB:
     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
@@ -112668,7 +112282,7 @@
     28:28:void logResults():173 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:30:void logResults():173:174 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.nB:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():185:185 -> <clinit>
     1:1:void <init>():188:188 -> <init>
@@ -112676,9 +112290,9 @@
     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.yB:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.rB:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> c
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.kD:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.dD:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.function.Consumer consumer -> c
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector annotationDirectReferenceCollector -> a
@@ -112722,7 +112336,7 @@
     32:45:com.android.tools.r8.graph.DexProgramClass getFirstReferenceOutsideFromCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):79:92 -> a
     46:50:void lambda$getFirstReferenceOutsideFromCode$2(com.android.tools.r8.graph.AppView,java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType):83:87 -> a
     1:1:java.util.function.Consumer access$300(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):30:30 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.iD:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.bD:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):189:189 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):189:189 -> <init>
@@ -112734,7 +112348,7 @@
     8:8:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):233:233 -> a
     9:9:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):238:238 -> a
     1:2:boolean addField(com.android.tools.r8.graph.DexField):199:200 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.cD:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> e
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):107:107 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.ProgramMethod):109:110 -> <init>
@@ -112899,14 +112513,14 @@
     1:1:boolean contains(com.android.tools.r8.graph.DexType):384 -> e
     2:2:boolean isDependency(com.android.tools.r8.graph.DexType):376:376 -> e
     2:2:boolean contains(com.android.tools.r8.graph.DexType):384 -> e
-com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.lD:
+com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.eD:
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_DEPENDENCY -> d
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup NOT_IN_MAIN_DEX -> e
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_LIST -> b
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_ROOT -> c
     1:4:void <clinit>():38:41 -> <clinit>
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.mD:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.fD:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexInfo$Builder mainDexInfoBuilder -> d
@@ -113006,12 +112620,12 @@
     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() -> e
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.bE:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.UD:
 # {"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.MinimumKeepInfoCollection -> com.android.tools.r8.internal.YE:
+com.android.tools.r8.shaking.MinimumKeepInfoCollection -> com.android.tools.r8.internal.RE:
     java.util.Map minimumKeepInfo -> a
     com.android.tools.r8.shaking.MinimumKeepInfoCollection EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -113068,7 +112682,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$getOrCreateMinimumKeepInfoFor$5(com.android.tools.r8.graph.DexReference):100:100 -> b
     2:2:boolean isEmpty():110:110 -> b
-com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.cF:
+com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.VE:
     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>
@@ -113076,7 +112690,7 @@
     2:2:void forEach(java.util.function.Consumer):54:54 -> a
     3:3:boolean contains(com.android.tools.r8.graph.DexType):58:58 -> a
     1:1:com.android.tools.r8.shaking.MissingClasses empty():50:50 -> b
-com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.bF:
+com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.UE:
     java.util.Map newMissingClasses -> b
     java.util.Set newIgnoredMissingClasses -> c
     java.util.Set alreadyMissingClasses -> a
@@ -113158,12 +112772,12 @@
     14:14:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262:262 -> b
     15:16:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):273:274 -> b
     15:16:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262 -> b
-    17:17:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJavaConversionTypes():517:517 -> b
+    17:17:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJavaConversionTypes():515:515 -> b
     17:17:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):282 -> b
     17:17:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262 -> b
     18:18:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):282:282 -> b
     18:18:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262 -> b
-    19:19:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJ$ConversionTypes():526:526 -> b
+    19:19:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory.getJ$ConversionTypes():524:524 -> b
     19:19:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):283 -> b
     19:19:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262 -> b
     20:21:java.util.Set com.android.tools.r8.shaking.MissingClasses$Builder.getAllowedMissingClasses(com.android.tools.r8.graph.DexItemFactory):283:284 -> b
@@ -113248,7 +112862,7 @@
     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() -> e
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.cN:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.SM:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
@@ -113492,7 +113106,7 @@
     3:3:java.util.List buildInheritanceAnnotations():120:120 -> c
     1:7:com.android.tools.r8.position.Position getPosition():73:79 -> d
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.jN:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.ZM:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> b
     com.android.tools.r8.shaking.ProguardClassType INTERFACE -> e
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> f
@@ -113511,25 +113125,25 @@
     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.dN:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.TM:
     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.eN:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.UM:
     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.fN:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.VM:
     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.gN:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.WM:
     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.hN:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.XM:
     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.iN:
+com.android.tools.r8.shaking.ProguardClassType$6 -> com.android.tools.r8.internal.YM:
     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.lN:
+com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r8.internal.bN:
     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>
@@ -113549,7 +113163,7 @@
     53:53:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):31 -> a
     54:59:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):32:37 -> a
     60:60:boolean isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
-com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.kN:
+com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.aN:
     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
@@ -113817,12 +113431,12 @@
     338:338:void validate():151:151 -> n
     168:173:void validate():151:156 -> n
     174:174:void validate():0:0 -> n
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":343,"2":344,"3":345,"4":346,"5":347}}
-    343:343:void validate():156:156 -> n
-    344:344:void validate():156:156 -> n
-    345:345:void validate():156:156 -> n
-    346:346:void validate():156:156 -> n
-    347:347:void validate():156:156 -> n
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":334,"2":335,"3":336,"4":337,"5":338}}
+    334:334:void validate():156:156 -> n
+    335:335:void validate():156:156 -> n
+    336:336:void validate():156:156 -> n
+    337:337:void validate():156:156 -> n
+    338:338:void validate():156:156 -> n
     330:333:void validate():156:159 -> n
 com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.z1$a:
     java.util.List wildcards -> b
@@ -114700,10 +114314,10 @@
     239:241:void parse():233:233 -> j
     245:246:void parse():237:238 -> j
     247:247:void parse():0:0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":493,"2":494,"3":495}}
-    493:493:void parse():238:238 -> j
-    494:494:void parse():238:238 -> j
-    495:495:void parse():238:238 -> j
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":486,"2":487,"3":488}}
+    486:486:void parse():238:238 -> j
+    487:487:void parse():238:238 -> j
+    488:488:void parse():238:238 -> j
     485:485:void parse():238:238 -> j
     1:12:java.util.List parseArgumentList():1478:1489 -> k
     13:13:java.util.List parseArgumentList():1486:1486 -> k
@@ -114734,10 +114348,10 @@
     1:3:boolean parseIgnoredReturnValueAttributes():629:631 -> n
     1:5:void parseInclude():637:641 -> o
     6:6:void parseInclude():0:0 -> o
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1309,"2":1310,"3":1311}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1307,"2":1308,"3":1309}}
+    1307:1307:void parseInclude():646:646 -> o
+    1308:1308:void parseInclude():646:646 -> o
     1309:1309:void parseInclude():646:646 -> o
-    1310:1310:void parseInclude():646:646 -> o
-    1311:1311:void parseInclude():646:646 -> o
     652:652:void parseInclude():646:646 -> o
     653:654:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2176:2177 -> o
     653:654:void parseInclude():646 -> o
@@ -114746,10 +114360,10 @@
     655:656:void parseInclude():646 -> o
     657:657:void parseInclude():646:646 -> o
     658:658:void parseInclude():0:0 -> o
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1312,"2":1313,"3":1314}}
-    1312:1312:void parseInclude():643:643 -> o
-    1313:1313:void parseInclude():643:643 -> o
-    1314:1314:void parseInclude():643:643 -> o
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1307,"2":1308,"3":1309}}
+    1307:1307:void parseInclude():643:643 -> o
+    1308:1308:void parseInclude():643:643 -> o
+    1309:1309:void parseInclude():643:643 -> o
     1301:1301:void parseInclude():643:643 -> o
     1302:1303:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2176:2177 -> o
     1302:1303:void parseInclude():643 -> o
@@ -115491,16 +115105,16 @@
     880:880:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):928 -> p
     880:880:boolean parseOption():418 -> p
     881:881:boolean parseOption():0:0 -> p
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":928,"2":929,"3":930}}
-    928:928:void verifyAndLinkBackReferences(java.lang.Iterable):999:999 -> p
-    928:928:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):928 -> p
-    928:928:boolean parseOption():418 -> p
-    929:929:void verifyAndLinkBackReferences(java.lang.Iterable):999:999 -> p
-    929:929:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):928 -> p
-    929:929:boolean parseOption():418 -> p
-    930:930:void verifyAndLinkBackReferences(java.lang.Iterable):999:999 -> p
-    930:930:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):928 -> p
-    930:930:boolean parseOption():418 -> p
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":923,"2":924,"3":925}}
+    923:923:void verifyAndLinkBackReferences(java.lang.Iterable):999:999 -> p
+    923:923:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):928 -> p
+    923:923:boolean parseOption():418 -> p
+    924:924:void verifyAndLinkBackReferences(java.lang.Iterable):999:999 -> p
+    924:924:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):928 -> p
+    924:924:boolean parseOption():418 -> p
+    925:925:void verifyAndLinkBackReferences(java.lang.Iterable):999:999 -> p
+    925:925:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):928 -> p
+    925:925:boolean parseOption():418 -> p
     882:886:void verifyAndLinkBackReferences(java.lang.Iterable):999:999 -> p
     882:886:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):928 -> p
     882:886:boolean parseOption():418 -> p
@@ -115563,9 +115177,9 @@
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():148:148 -> a
     1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):135:135 -> d
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):140:143 -> e
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.mN:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.cN:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.nN:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.dN:
     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>
@@ -115573,14 +115187,14 @@
     1:1:java.lang.String get():29:29 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.oN:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.eN:
     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.pN:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.fN:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -115709,7 +115323,7 @@
     1:1:void <init>():65:65 -> <init>
     2:2:void <init>():62:62 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.qN:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.gN:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -115825,7 +115439,7 @@
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsOptimization(boolean):34:34 -> e
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsShrinking(boolean):29:29 -> f
     1:1:void setIncludeDescriptorClasses(boolean):44:44 -> g
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.sN:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.iN:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> f
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> c
@@ -115840,7 +115454,7 @@
     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.rN:
+com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.hN:
     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.T1:
@@ -115942,7 +115556,7 @@
     134:134:java.lang.String toString():115:115 -> toString
     135:135:java.lang.String toString():116:116 -> toString
     118:132:java.lang.String toString():117:131 -> toString
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.yN:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.oN:
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> h
     com.android.tools.r8.shaking.ProguardMemberType INIT -> g
     com.android.tools.r8.shaking.ProguardMemberType CLINIT -> f
@@ -116011,7 +115625,7 @@
     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.zN:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.pN:
     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
@@ -116100,7 +115714,7 @@
     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.AN:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.qN:
     com.android.tools.r8.position.Position position -> e
     com.android.tools.r8.origin.Origin origin -> d
     java.lang.String snippet -> c
@@ -116277,16 +115891,16 @@
     1:5:com.android.tools.r8.shaking.ProguardWildcard$BackReference materialize():110:114 -> f
     1:5:com.android.tools.r8.shaking.ProguardWildcard materialize():80 -> f
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":262,"2":263,"3":264}}
-    262:262:java.lang.String toString():130:130 -> toString
-    263:263:java.lang.String toString():130:130 -> toString
-    264:264:java.lang.String toString():130:130 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":133,"2":134,"3":135}}
+    133:133:java.lang.String toString():130:130 -> toString
+    134:134:java.lang.String toString():130:130 -> toString
+    135:135:java.lang.String toString():130:130 -> toString
     131:131:java.lang.String toString():130:130 -> toString
     132:132:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":265,"2":266,"3":267}}
-    265:265:java.lang.String toString():130:130 -> toString
-    266:266:java.lang.String toString():130:130 -> toString
-    267:267:java.lang.String toString():130:130 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":133,"2":134,"3":135}}
+    133:133:java.lang.String toString():130:130 -> toString
+    134:134:java.lang.String toString():130:130 -> toString
+    135:135:java.lang.String toString():130:130 -> toString
 com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.shaking.p2$b:
     java.lang.String pattern -> a
     java.lang.String captured -> b
@@ -116334,7 +115948,7 @@
     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() -> e
     1:11:com.android.tools.r8.shaking.ReprocessMethodRule build():39:49 -> f
-com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.IT:
+com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.yT:
 com.android.tools.r8.shaking.RootSetUtils$1 -> com.android.tools.r8.shaking.u2:
     int[] $SwitchMap$com$android$tools$r8$shaking$InlineRule$Type -> b
     int[] $SwitchMap$com$android$tools$r8$shaking$ClassInlineRule$Type -> c
@@ -116626,10 +116240,10 @@
     2036:2036:java.lang.String toString():2025:2025 -> toString
     2037:2037:java.lang.String toString():2026:2026 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2038,"2":2039,"3":2040}}
-    2038:2038:java.lang.String toString():2027:2027 -> toString
-    2039:2039:java.lang.String toString():2027:2027 -> toString
-    2040:2040:java.lang.String toString():2027:2027 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2035,"2":2036,"3":2037}}
+    2035:2035:java.lang.String toString():2027:2027 -> toString
+    2036:2036:java.lang.String toString():2027:2027 -> toString
+    2037:2037:java.lang.String toString():2027:2027 -> toString
     2029:2034:java.lang.String toString():2027:2032 -> toString
 com.android.tools.r8.shaking.RootSetUtils$RootSetBase -> com.android.tools.r8.shaking.A2:
     java.util.Map dependentKeepClassCompatRule -> d
@@ -116808,270 +116422,275 @@
     2780:2782:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):260:262 -> a
     2783:2785:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):261:263 -> a
     2786:2786:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):250:250 -> a
-    2787:2798:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):875:886 -> a
-    2799:2799:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):967:967 -> a
-    2799:2799:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):886 -> a
-    2800:2800:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):966:966 -> a
-    2800:2800:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):886 -> a
-    2801:2817:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):888:904 -> a
-    2818:2823:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):911:916 -> a
-    2824:2824:boolean lambda$anySourceMatchesInheritanceRuleDirectly$13(boolean,com.android.tools.r8.graph.DexType):915:915 -> a
-    2825:2827:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):950:952 -> a
-    2828:2828:boolean sideEffectFreeIsRuleSatisfiedByField(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClassAndField):961:961 -> a
-    2829:2830:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):979:980 -> a
-    2831:2841:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):976:986 -> a
-    2842:2842:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
-    2842:2842:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):987 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2843:2843:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
-    2843:2843:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):987 -> a
-    2844:2844:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):987:987 -> a
+    2787:2787:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):817:817 -> a
+    2788:2788:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):967:967 -> a
+    2788:2788:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):817 -> a
+    2789:2789:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):966:966 -> a
+    2789:2789:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):817 -> a
+    2790:2801:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):875:886 -> a
+    2802:2802:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):967:967 -> a
+    2802:2802:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):886 -> a
+    2803:2803:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):966:966 -> a
+    2803:2803:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):886 -> a
+    2804:2820:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):888:904 -> a
+    2821:2826:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):911:916 -> a
+    2827:2827:boolean lambda$anySourceMatchesInheritanceRuleDirectly$13(boolean,com.android.tools.r8.graph.DexType):915:915 -> a
+    2828:2830:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):950:952 -> a
+    2831:2831:boolean sideEffectFreeIsRuleSatisfiedByField(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClassAndField):961:961 -> a
+    2832:2833:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):979:980 -> a
+    2834:2844:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):976:986 -> a
     2845:2845:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
-    2845:2845:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):75 -> a
-    2845:2845:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):992 -> a
-    2846:2846:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):75:75 -> a
-    2846:2846:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):992 -> a
-    2847:2847:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):992:992 -> a
-    2848:2854:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):989:995 -> a
-    2855:2859:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1008:1012 -> a
-    2860:2861:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):1029:1030 -> a
-    2860:2861:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1014 -> a
-    2862:2865:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1018:1021 -> a
-    2866:2871:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1019:1024 -> a
-    2872:2880:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1045:1053 -> a
-    2881:2881:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2881:2881:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1052 -> a
-    2882:2884:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1056:1058 -> a
-    2885:2888:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1069:1072 -> a
-    2889:2889:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2889:2889:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1072 -> a
-    2890:2890:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1074:1074 -> a
-    2891:2908:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1088:1105 -> a
-    2909:2909:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():696:696 -> a
-    2909:2909:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1106 -> a
-    2910:2910: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):69:69 -> a
-    2910:2910:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1106 -> a
+    2845:2845:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):987 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2911:2911: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):70:70 -> a
-    2911:2911:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1106 -> a
-    2912:2912:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:493 -> a
-    2912:2912:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1107 -> a
+    2846:2846:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
+    2846:2846:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):987 -> a
+    2847:2847:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):987:987 -> a
+    2848:2848:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():79:79 -> a
+    2848:2848:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):75 -> a
+    2848:2848:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):992 -> a
+    2849:2849:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):75:75 -> a
+    2849:2849:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):992 -> a
+    2850:2850:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):992:992 -> a
+    2851:2857:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):989:995 -> a
+    2858:2862:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1008:1012 -> a
+    2863:2864:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):1029:1030 -> a
+    2863:2864:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1014 -> a
+    2865:2868:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1018:1021 -> a
+    2869:2874:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1019:1024 -> a
+    2875:2883:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1045:1053 -> a
+    2884:2884:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2884:2884:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1052 -> a
+    2885:2887:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1056:1058 -> a
+    2888:2891:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1069:1072 -> a
+    2892:2892:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2892:2892:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1072 -> a
+    2893:2893:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1074:1074 -> a
+    2894:2911:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1088:1105 -> a
+    2912:2912:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():696:696 -> a
+    2912:2912:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1106 -> a
+    2913:2913: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):69:69 -> a
+    2913:2913:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1106 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2913:2914:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:494 -> a
-    2913:2914:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1107 -> a
-    2915:2919:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1108:1112 -> a
-    2920:2920:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> a
-    2920:2920:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1112 -> a
+    2914:2914: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):70:70 -> a
+    2914:2914:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1106 -> a
+    2915:2915:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:493 -> a
+    2915:2915:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1107 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2921:2922:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1112:1113 -> a
-    2923:2923:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():696:696 -> a
-    2923:2923:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1114 -> a
-    2924:2924: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):69:69 -> a
-    2924:2924:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1114 -> a
+    2916:2917:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:494 -> a
+    2916:2917:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1107 -> a
+    2918:2922:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1108:1112 -> a
+    2923:2923:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> a
+    2923:2923:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2925:2925: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):70:70 -> a
-    2925:2925:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1114 -> a
-    2926:2926:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1115:1115 -> a
-    2927:2927:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1141:1141 -> a
-    2928:2928:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
-    2928:2928:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1141 -> a
-    2929:2934:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1142:1147 -> a
-    2935:2946:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1146:1157 -> a
-    2947:2966:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1156:1175 -> a
-    2967:2967:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
-    2967:2967:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1177 -> a
-    2968:2970:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1178:1180 -> a
-    2971:2972:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1390:1391 -> a
-    2971:2972:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1179 -> a
-    2973:2996:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1181:1204 -> a
-    2997:2997:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1201:1201 -> a
-    2998:3001:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1195:1198 -> a
-    3002:3005:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1189:1192 -> a
-    3006:3033:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1186:1213 -> a
-    3034:3034:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1210:1210 -> a
-    3035:3035:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
-    3035:3035:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1214 -> a
-    3036:3054:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1215:1233 -> a
-    3055:3063:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1227:1235 -> a
-    3064:3064:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
-    3065:3065:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4471,"2":4472,"3":4473}}
-    4471:4471:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
-    4472:4472:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
-    4473:4473:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
-    4285:4352:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220:1287 -> a
-    4353:4353:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    4353:4353:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1287 -> a
-    4354:4359:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1288:1293 -> a
-    4360:4360:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    4360:4360:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1293 -> a
-    4361:4369:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1294:1302 -> a
-    4370:4370:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1572:1572 -> a
-    4370:4370:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4371:4371:boolean isMainDexRootSetBuilder():0:0 -> a
-    4371:4371:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1572 -> a
-    4371:4371:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4372:4384:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1572:1584 -> a
-    4372:4384:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4385:4385:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():499:499 -> a
-    4385:4385:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1584 -> a
+    2924:2925:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1112:1113 -> a
+    2926:2926:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():696:696 -> a
+    2926:2926:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1114 -> a
+    2927:2927: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):69:69 -> a
+    2927:2927:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1114 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4385:4385:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4386:4386:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():499:499 -> a
-    4386:4386:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1584 -> a
-    4386:4386:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4387:4387:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1585 -> a
-    4387:4387:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4388:4388:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
+    2928:2928: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):70:70 -> a
+    2928:2928:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1114 -> a
+    2929:2929:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1115:1115 -> a
+    2930:2930:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1141:1141 -> a
+    2931:2931:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
+    2931:2931:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1141 -> a
+    2932:2937:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1142:1147 -> a
+    2938:2949:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1146:1157 -> a
+    2950:2969:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1156:1175 -> a
+    2970:2970:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
+    2970:2970:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1177 -> a
+    2971:2973:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1178:1180 -> a
+    2974:2975:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1390:1391 -> a
+    2974:2975:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1179 -> a
+    2976:2999:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1181:1204 -> a
+    3000:3000:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1201:1201 -> a
+    3001:3004:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1195:1198 -> a
+    3005:3008:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1189:1192 -> a
+    3009:3036:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1186:1213 -> a
+    3037:3037:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1210:1210 -> a
+    3038:3038:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
+    3038:3038:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1214 -> a
+    3039:3057:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1215:1233 -> a
+    3058:3066:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1227:1235 -> a
+    3067:3067:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
+    3068:3068:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4474,"2":4475,"3":4476}}
-    4474:4474:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1585 -> a
-    4474:4474:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4475:4475:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1585 -> a
-    4475:4475:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4476:4476:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1585 -> a
-    4476:4476:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4389:4392:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1588:1591 -> a
-    4389:4392:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4393:4404:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1596 -> a
-    4393:4404:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
-    4405:4416:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1304:1315 -> a
-    4417:4425:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1309:1317 -> a
-    4426:4426:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
-    4426:4426:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1319 -> a
-    4427:4437:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1320:1330 -> a
-    4438:4470:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1324:1356 -> a
-    4477:4479:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1383:1385 -> a
-    4480:4480:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1395:1395 -> a
-    4481:4481:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    4481:4481:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1396 -> a
-    4482:4482:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    4482:4482:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1396 -> a
+    4474:4474:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
+    4475:4475:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
+    4476:4476:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
+    4288:4355:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220:1287 -> a
+    4356:4356:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    4356:4356:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1287 -> a
+    4357:4362:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1288:1293 -> a
+    4363:4363:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    4363:4363:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1293 -> a
+    4364:4372:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1294:1302 -> a
+    4373:4373:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1572:1572 -> a
+    4373:4373:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4374:4374:boolean isMainDexRootSetBuilder():0:0 -> a
+    4374:4374:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1572 -> a
+    4374:4374:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4375:4387:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1572:1584 -> a
+    4375:4387:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4388:4388:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():499:499 -> a
+    4388:4388:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1584 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4483:4484:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1397:1398 -> a
-    4485:4485:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1411:1411 -> a
-    4486:4486:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
-    4486:4486:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1411 -> a
+    4388:4388:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4389:4389:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():499:499 -> a
+    4389:4389:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1584 -> a
+    4389:4389:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4390:4390:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1585 -> a
+    4390:4390:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4391:4391:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4477,"2":4478,"3":4479}}
+    4477:4477:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1585 -> a
+    4477:4477:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4478:4478:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1585 -> a
+    4478:4478:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4479:4479:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1585 -> a
+    4479:4479:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4392:4395:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1588:1591 -> a
+    4392:4395:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4396:4407:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1585:1596 -> a
+    4396:4407:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1303 -> a
+    4408:4419:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1304:1315 -> a
+    4420:4428:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1309:1317 -> a
+    4429:4429:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
+    4429:4429:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1319 -> a
+    4430:4440:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1320:1330 -> a
+    4441:4473:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1324:1356 -> a
+    4480:4482:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1383:1385 -> a
+    4483:4483:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1395:1395 -> a
+    4484:4484:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    4484:4484:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1396 -> a
+    4485:4485:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    4485:4485:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1396 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4487:4487:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1411:1411 -> a
-    4488:4488:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1410:1410 -> a
-    4489:4489:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
-    4489:4489:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1409 -> a
-    4490:4491: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):1424:1425 -> a
-    4492:4492:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
-    4492:4492: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
+    4486:4487:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1397:1398 -> a
+    4488:4488:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1411:1411 -> a
+    4489:4489:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
+    4489:4489:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1411 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4493:4493:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
-    4493:4493: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
-    4494:4511: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:1443 -> a
-    4512:4512:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):291:291 -> a
-    4512:4512: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):1443 -> a
+    4490:4490:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1411:1411 -> a
+    4491:4491:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1410:1410 -> a
+    4492:4492:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
+    4492:4492:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1409 -> a
+    4493:4494: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):1424:1425 -> a
+    4495:4495:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
+    4495:4495: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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4513:4513:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):291:291 -> a
-    4513:4513: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):1443 -> a
-    4514:4514: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):1453:1453 -> a
-    4515:4515:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
-    4515:4515: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):1454 -> a
+    4496:4496:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
+    4496:4496: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
+    4497:4514: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:1443 -> a
+    4515:4515:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):291:291 -> a
+    4515:4515: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):1443 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4516:4516:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
-    4516:4516: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):1454 -> a
-    4517:4535: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):1460:1478 -> a
-    4536:4539: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):1477:1480 -> a
-    4540:4544:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1600:1604 -> a
-    4540:4544: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):1483 -> a
-    4545:4563: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):1484:1502 -> a
-    4564:4564:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():624:624 -> a
-    4564:4564: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):1502 -> a
+    4516:4516:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):291:291 -> a
+    4516:4516: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):1443 -> a
+    4517:4517: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):1453:1453 -> a
+    4518:4518:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
+    4518:4518: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):1454 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4565:4567: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):1502:1504 -> a
-    4568:4568: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):69:69 -> a
-    4568:4568: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):1504 -> a
+    4519:4519:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
+    4519:4519: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):1454 -> a
+    4520:4538: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):1460:1478 -> a
+    4539:4542: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):1477:1480 -> a
+    4543:4547:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1600:1604 -> a
+    4543:4547: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):1483 -> a
+    4548:4566: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):1484:1502 -> a
+    4567:4567:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():623:623 -> a
+    4567:4567: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):1502 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4569:4569: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):70:70 -> a
-    4569:4569: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):1504 -> a
-    4570:4575: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):1505:1510 -> a
-    4576:4576: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):69:69 -> a
-    4576:4576: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):1510 -> a
+    4568:4570: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):1502:1504 -> a
+    4571:4571: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):69:69 -> a
+    4571:4571: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):1504 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4577:4577: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):70:70 -> a
-    4577:4577: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):1510 -> a
-    4578:4578:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:493 -> a
-    4578:4578: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):1511 -> a
+    4572:4572: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):70:70 -> a
+    4572:4572: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):1504 -> a
+    4573:4578: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):1505:1510 -> a
+    4579:4579: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):69:69 -> a
+    4579:4579: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):1510 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4579:4580:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:494 -> a
-    4579:4580: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):1511 -> a
-    4581:4584: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):1512:1515 -> a
-    4585:4585:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
-    4585:4585: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):1515 -> a
+    4580:4580: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):70:70 -> a
+    4580:4580: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):1510 -> a
+    4581:4581:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:493 -> a
+    4581:4581: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):1511 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4586:4586:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
-    4586:4586: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):1515 -> a
-    4587:4587: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):1521:1521 -> a
-    4588:4588:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():696:696 -> a
-    4588:4588: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):1521 -> a
+    4582:4583:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:494 -> a
+    4582:4583: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):1511 -> a
+    4584:4587: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):1512:1515 -> a
+    4588:4588:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
+    4588:4588: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):1515 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4589:4589:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():697:697 -> a
-    4589:4589: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):1521 -> a
-    4590:4592: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):1521:1523 -> a
-    4593:4593: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):69:69 -> a
-    4593:4593: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):1523 -> a
+    4589:4589:boolean com.android.tools.r8.graph.DexClassAndMethod.isDefaultMethod():37:37 -> a
+    4589:4589: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):1515 -> a
+    4590:4590: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):1521:1521 -> a
+    4591:4591:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():695:695 -> a
+    4591:4591: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):1521 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4594:4594: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):70:70 -> a
-    4594:4594: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):1523 -> a
-    4595:4599: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):1524:1528 -> a
-    4600:4600:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():634:634 -> a
-    4600:4600:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():609 -> a
-    4600:4600: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):1528 -> a
+    4592:4592:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():696:696 -> a
+    4592:4592: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):1521 -> a
+    4593:4595: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):1521:1523 -> a
+    4596:4596: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):69:69 -> a
+    4596:4596: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):1523 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4597:4597: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):70:70 -> a
+    4597:4597: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):1523 -> a
+    4598:4602: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):1524:1528 -> a
+    4603:4603:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():633:633 -> a
+    4603:4603:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():608 -> a
+    4603:4603: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):1528 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4601:4603: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):1528:1530 -> a
-    4604:4604: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):69:69 -> a
-    4604:4604: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):1530 -> a
+    4604:4606: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):1528:1530 -> a
+    4607:4607: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):69:69 -> a
+    4607:4607: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):1530 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4605:4605: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):70:70 -> a
-    4605:4605: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):1530 -> a
-    4606:4610: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):1531:1535 -> a
-    4611:4611:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> a
-    4611:4611: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):1535 -> a
+    4608:4608: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):70:70 -> a
+    4608:4608: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):1530 -> a
+    4609:4613: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):1531:1535 -> a
+    4614:4614:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> a
+    4614:4614: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):1535 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4612:4614: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):1535:1537 -> a
-    4615:4615: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):69:69 -> a
-    4615:4615: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):1537 -> a
+    4615:4617: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):1535:1537 -> a
+    4618:4618: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):69:69 -> a
+    4618:4618: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):1537 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4616:4616: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):70:70 -> a
-    4616:4616: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):1537 -> a
-    4617:4621: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):1538:1542 -> a
-    4622:4622:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():624:624 -> a
-    4622:4622: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):1542 -> a
+    4619:4619: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):70:70 -> a
+    4619:4619: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):1537 -> a
+    4620:4624: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):1538:1542 -> a
+    4625:4625:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():623:623 -> a
+    4625:4625: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):1542 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4623:4625: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):1542:1544 -> a
-    4626:4626: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):69:69 -> a
-    4626:4626: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):1544 -> a
+    4626:4628: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):1542:1544 -> a
+    4629:4629: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):69:69 -> a
+    4629:4629: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):1544 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4627:4627: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):70:70 -> a
-    4627:4627: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):1544 -> a
-    4628:4632: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):1545:1549 -> a
-    4633:4633:boolean isMainDexRootSetBuilder():0:0 -> a
-    4633:4633: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):1549 -> a
-    4634:4638: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):1549:1553 -> a
-    4639:4639: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):69:69 -> a
-    4639:4639: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):1553 -> a
+    4630:4630: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):70:70 -> a
+    4630:4630: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):1544 -> a
+    4631:4635: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):1545:1549 -> a
+    4636:4636:boolean isMainDexRootSetBuilder():0:0 -> a
+    4636:4636: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):1549 -> a
+    4637:4641: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):1549:1553 -> a
+    4642:4642: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):69:69 -> a
+    4642:4642: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):1553 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4640:4640: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):70:70 -> a
-    4640:4640: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):1553 -> a
-    4641:4641:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:493 -> a
-    4641:4641: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):1554 -> a
+    4643:4643: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):70:70 -> a
+    4643:4643: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):1553 -> a
+    4644:4644:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:493 -> a
+    4644:4644: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):1554 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4642:4643:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:494 -> a
-    4642:4643: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):1554 -> a
-    4644:4652: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):1555:1563 -> a
-    4653:4663:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1121:1131 -> a
-    4653:4663: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):1564 -> a
-    4664:4664: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):1565:1565 -> a
-    4665:4665:java.util.Set lambda$evaluateKeepRule$17(com.android.tools.r8.graph.DexType):1466:1466 -> a
-    4666:4670:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1609:1613 -> a
-    4671:4671:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$18(com.android.tools.r8.utils.OriginWithPosition):1612:1612 -> a
-    4672:4672:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1617:1617 -> a
-    4673:4685:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1632:1644 -> a
-    4686:4686:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1639:1639 -> a
+    4645:4646:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):493:494 -> a
+    4645:4646: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):1554 -> a
+    4647:4655: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):1555:1563 -> a
+    4656:4666:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1121:1131 -> a
+    4656:4666: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):1564 -> a
+    4667:4667: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):1565:1565 -> a
+    4668:4668:java.util.Set lambda$evaluateKeepRule$17(com.android.tools.r8.graph.DexType):1466:1466 -> a
+    4669:4673:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1609:1613 -> a
+    4674:4674:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$18(com.android.tools.r8.utils.OriginWithPosition):1612:1612 -> a
+    4675:4675:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1617:1617 -> a
+    4676:4688:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1632:1644 -> a
+    4689:4689:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1639:1639 -> a
     void lambda$sideEffectFreeIsRuleSatisfiedByField$14(com.android.tools.r8.shaking.AnnotationMatchResult) -> b
     1:1:java.util.Queue access$400(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):104:104 -> b
     2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):231:231 -> b
@@ -117086,48 +116705,43 @@
     50:51:void lambda$markMatchingOverriddenMethods$6(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):683:684 -> b
     52:52:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):696:696 -> b
     53:54:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):718:719 -> b
-    55:55:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):817:817 -> b
-    56:56:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):967:967 -> b
-    56:56:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):817 -> b
-    57:57:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):966:966 -> b
-    57:57:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):817 -> b
-    58:60:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):939:941 -> b
-    61:63:void finalizeCheckDiscardedInformation():1402:1404 -> b
-    64:64:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
-    64:64:void finalizeCheckDiscardedInformation():1403 -> b
-    65:65:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
-    65:65:void finalizeCheckDiscardedInformation():1403 -> b
+    55:55:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829:829 -> b
+    55:55:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> b
+    56:66:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):839:849 -> b
+    56:66:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829 -> b
+    56:66:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> b
+    67:67:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):967:967 -> b
+    67:67:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):849 -> b
+    67:67:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829 -> b
+    67:67:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> b
+    68:68:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):966:966 -> b
+    68:68:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):849 -> b
+    68:68:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829 -> b
+    68:68:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> b
+    69:73:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):851:855 -> b
+    69:73:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829 -> b
+    69:73:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> b
+    74:74:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):834:834 -> b
+    74:74:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> b
+    75:80:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):861:866 -> b
+    75:80:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):825 -> b
+    81:83:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):939:941 -> b
+    84:86:void finalizeCheckDiscardedInformation():1402:1404 -> b
+    87:87:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
+    87:87:void finalizeCheckDiscardedInformation():1403 -> b
+    88:88:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection) -> b
+    88:88:void finalizeCheckDiscardedInformation():1403 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:67:void finalizeCheckDiscardedInformation():1405:1406 -> b
-    68:68:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):332:332 -> b
-    68:68:void finalizeCheckDiscardedInformation():1407 -> b
+    89:90:void finalizeCheckDiscardedInformation():1405:1406 -> b
+    91:91:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):332:332 -> b
+    91:91:void finalizeCheckDiscardedInformation():1407 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:72:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):333:336 -> b
-    69:72:void finalizeCheckDiscardedInformation():1407 -> b
-    73:74:void finalizeCheckDiscardedInformation():1412:1413 -> b
+    92:95:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):333:336 -> b
+    92:95:void finalizeCheckDiscardedInformation():1407 -> b
+    96:97:void finalizeCheckDiscardedInformation():1412:1413 -> b
     1:1:com.android.tools.r8.shaking.DexStringCache access$700(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):104:104 -> c
     2:27:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):661:686 -> c
-    28:28:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829:829 -> c
-    28:28:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> c
-    29:39:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):839:849 -> c
-    29:39:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829 -> c
-    29:39:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> c
-    40:40:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):967:967 -> c
-    40:40:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):849 -> c
-    40:40:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829 -> c
-    40:40:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> c
-    41:41:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):966:966 -> c
-    41:41:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):849 -> c
-    41:41:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829 -> c
-    41:41:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> c
-    42:46:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):851:855 -> c
-    42:46:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):829 -> c
-    42:46:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> c
-    47:47:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):834:834 -> c
-    47:47:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):821 -> c
-    48:53:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):861:866 -> c
-    48:53:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):825 -> c
-    54:60:void generateAssumeNoSideEffectsWarnings():1623:1629 -> c
+    28:34:void generateAssumeNoSideEffectsWarnings():1623:1629 -> c
 com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$1 -> com.android.tools.r8.shaking.B2:
     1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):1488:1488 -> <init>
     void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -117155,7 +116769,7 @@
     53:53:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     53:53:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):634 -> a
     54:55:void lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):642:643 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.OT:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.ET:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -117167,7 +116781,7 @@
     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.NT:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.DT:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Set instanceOfTypes -> c
     java.util.Set checkCastTypes -> d
@@ -117205,7 +116819,7 @@
     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.ZU:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.PU:
     java.util.Map cache -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -117218,7 +116832,7 @@
     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.VY:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.LY:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> d
     java.util.Set methodsToKeepForConfigurationDebugging -> e
@@ -117314,14 +116928,14 @@
     1:1:java.util.Set access$100(com.android.tools.r8.shaking.TreePruner):44:44 -> b
     2:9:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):168:175 -> b
     10:10:java.util.Set getRemovedClasses():384:384 -> b
-com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.UY:
+com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.KY:
     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.WY:
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.MY:
     boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.Y00:
+com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.O00:
     com.android.tools.r8.shaking.UnusedItemsPrinter DONT_PRINT -> e
     com.android.tools.r8.shaking.UnusedItemsPrinter$Members currentMembers -> c
     java.util.List classes -> d
@@ -117400,7 +117014,7 @@
     6:9:void visited():61:64 -> b
     10:10:void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> b
     11:11:void registerUnusedField(com.android.tools.r8.graph.DexEncodedField):72:72 -> b
-com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.W00:
+com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.M00:
     java.util.List methods -> b
     java.util.List fields -> a
     1:3:void <init>():18:20 -> <init>
@@ -117408,7 +117022,7 @@
     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.X00:
+com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.N00:
     1:1:void <init>():139:139 -> <init>
     void finished() -> a
     void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -117416,7 +117030,7 @@
     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.K10:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.A10:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> r
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     java.util.List synthesizedBridges -> q
@@ -117436,231 +117050,229 @@
     java.util.Set mergeCandidates -> l
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> m
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedInterfaces -> n
-    1:1:void <clinit>():120:120 -> <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):258:258 -> <init>
-    2:44:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):231:273 -> <init>
-    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> a
-    2:3:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):334:335 -> a
+    1:1:void <clinit>():119:119 -> <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):257:257 -> <init>
+    2:44:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):230:272 -> <init>
+    1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> a
+    2:3:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):333:334 -> a
     4:4:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    4:4:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):335 -> a
-    5:20:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):336:351 -> a
-    21:30:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):358:367 -> a
-    31:42:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):375:386 -> a
+    4:4:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):334 -> a
+    5:20:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):335:350 -> a
+    21:30:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):357:366 -> a
+    31:42:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):374:385 -> a
     43:43:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    43:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):386 -> a
-    44:47:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):386:386 -> a
-    51:53:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):390:392 -> a
+    43:43:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385 -> a
+    44:47:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):385:385 -> a
+    51:53:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):389:391 -> 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):156:156 -> a
     54:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):204 -> a
-    54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):392 -> a
-    55:58:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:398 -> a
+    54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):391 -> a
+    55:58:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):394:397 -> a
     59:59:boolean com.android.tools.r8.graph.DexClass.isAnnotation():668:668 -> a
-    59:59:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):402 -> a
-    60:60:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405:405 -> a
+    59:59:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):401 -> a
+    60:60:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):404:404 -> a
     61:61:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):844:844 -> a
-    61:61:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
+    61:61:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405 -> a
     62:62:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):444:444 -> a
     62:62:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):844 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    62:62:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
+    62:62:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405 -> a
     63:63:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):444:444 -> a
     63:63:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):844 -> a
-    63:63:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
-    64:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406:406 -> a
+    63:63:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405 -> a
+    64:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405:405 -> a
     65:65:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):444:444 -> a
-    65:65:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):407 -> a
+    65:65:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     66:66:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):444:444 -> a
-    66:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):407 -> a
-    67:113:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):419:465 -> a
-    114:115:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):440:441 -> a
-    116:116:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):460:460 -> a
+    66:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
+    67:113:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):418:464 -> a
+    114:115:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):439:440 -> a
+    116:116:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):459:459 -> a
     117:117:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):124:124 -> a
-    117:117:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):461 -> a
+    117:117:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     118:118:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):125:125 -> a
-    118:118:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):461 -> a
-    119:119:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):461:461 -> a
+    118:118:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):460 -> a
+    119:119:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):460:460 -> a
     120:120:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.continueIf(boolean):17:17 -> a
     120:120:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):13 -> a
-    120:120:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):463 -> a
-    121:146:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):476:501 -> a
+    120:120:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$1(com.android.tools.r8.graph.ProgramMethod):462 -> a
+    121:146:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):475:500 -> a
     147:148:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1229:1230 -> a
-    147:148:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502 -> a
+    147:148:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):501 -> a
     149:149:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():447:447 -> a
     149:149:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1230 -> a
-    149:149:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502 -> a
-    150:151:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):503:504 -> a
+    149:149:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):501 -> a
+    150:151:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502:503 -> a
     152:153:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1229:1230 -> a
-    152:153:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505 -> a
+    152:153:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):504 -> a
     154:154:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():447:447 -> a
     154:154:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1230 -> a
-    154:154:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505 -> a
-    155:170:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):507:522 -> a
-    171:189:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):953:971 -> a
-    171:189:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):528 -> a
-    190:190:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):970:970 -> a
-    190:190:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):528 -> a
-    191:199:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):529:537 -> a
+    154:154:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):504 -> a
+    155:170:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):506:521 -> a
+    171:189:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):932:950 -> a
+    171:189:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):527 -> a
+    190:190:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):949:949 -> a
+    190:190:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):527 -> a
+    191:199:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):528:536 -> a
     200:200:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
-    200:200:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
+    200:200:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):537 -> a
     201:201:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):59:59 -> a
-    201:201:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
+    201:201:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):537 -> a
     202:206:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):68:72 -> a
     202:206:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):57 -> a
-    202:206:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
-    207:207:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539:539 -> a
+    202:206:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):537 -> a
+    207:207:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538:538 -> a
     208:208:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
-    208:208:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540 -> a
+    208:208:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539 -> a
     209:209:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):59:59 -> a
-    209:209:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540 -> a
+    209:209:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539 -> a
     210:214:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):68:72 -> a
     210:214:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):57 -> a
-    210:214:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540 -> a
-    215:217:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):541:543 -> a
-    218:219:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):515:516 -> a
-    220:221:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):495:496 -> a
-    222:222:boolean lambda$isStillMergeCandidate$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):491:491 -> a
-    223:258:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():703:738 -> a
-    259:259:void lambda$run$4(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):728:728 -> a
-    260:260:void lambda$run$4(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):727:727 -> a
-    261:261:void lambda$run$5(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):746:746 -> a
-    262:266:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):783:787 -> a
-    267:267:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    267:267:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):788 -> a
+    210:214:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539 -> a
+    215:217:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540:542 -> a
+    218:219:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):514:515 -> a
+    220:221:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494:495 -> a
+    222:222:boolean lambda$isStillMergeCandidate$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):490:490 -> a
+    223:252:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():702:731 -> a
+    253:253:void lambda$run$4(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):727:727 -> a
+    254:254:void lambda$run$4(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):726:726 -> a
+    255:259:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):762:766 -> a
+    260:260:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    260:260:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):767 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    268:268:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> a
-    268:268:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):789 -> a
-    269:276:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):792:799 -> a
-    277:277:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    277:277:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):801 -> a
-    278:287:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):802:811 -> a
-    288:294:void lambda$methodResolutionMayChange$7(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):867:873 -> a
-    295:295:void lambda$methodResolutionMayChange$8(com.android.tools.r8.graph.LookupLambdaTarget):878:878 -> a
-    296:347:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):890:941 -> a
-    348:358:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):937:947 -> a
-    359:359:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):943:943 -> a
-    360:360:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):928:928 -> a
-    361:370: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):1958:1967 -> a
-    361:370: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):423 -> a
-    371:382: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):1963:1974 -> a
-    371:382: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):423 -> a
-    383:383: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):1973:1973 -> a
-    383:383: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):423 -> a
-    384:384:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    384:384: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):1978 -> a
-    384:384: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):423 -> a
-    385:390: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):426:431 -> a
-    1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> b
-    2:20:void initializeMergeCandidates(java.lang.Iterable):277:295 -> b
-    21:21:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):552:552 -> b
+    261:261:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> a
+    261:261:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):768 -> a
+    262:269:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):771:778 -> a
+    270:270:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    270:270:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):780 -> a
+    271:280:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):781:790 -> a
+    281:287:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):846:852 -> a
+    288:288:void lambda$methodResolutionMayChange$6(com.android.tools.r8.graph.LookupLambdaTarget):857:857 -> a
+    289:340:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):869:920 -> a
+    341:351:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):916:926 -> a
+    352:352:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):922:922 -> a
+    353:353:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):907:907 -> a
+    354:363: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):1934:1943 -> a
+    354:363: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):422 -> a
+    364:375: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):1939:1950 -> a
+    364:375: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):422 -> a
+    376:376: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):1949:1949 -> a
+    376:376: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):422 -> a
+    377:377:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    377:377: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):1954 -> a
+    377:377: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):422 -> a
+    378:383: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):425:430 -> a
+    1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> b
+    2:20:void initializeMergeCandidates(java.lang.Iterable):276:294 -> b
+    21:21:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):551:551 -> b
     22:22:boolean com.android.tools.r8.graph.DexClass.isPrivate():737:737 -> b
-    22:22:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):556 -> b
+    22:22:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):555 -> b
     23:23:boolean com.android.tools.r8.graph.DexClass.isPublic():741:741 -> b
-    23:23:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):556 -> b
+    23:23:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):555 -> b
     24:24:boolean com.android.tools.r8.graph.DexClass.isPrivate():737:737 -> b
-    24:24:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):557 -> b
+    24:24:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):556 -> b
     25:25:boolean com.android.tools.r8.graph.DexClass.isPublic():741:741 -> b
-    25:25:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):557 -> b
+    25:25:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):556 -> b
     26:26:boolean com.android.tools.r8.graph.DexClass.isPublic():741:741 -> b
-    26:26:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):566 -> b
-    27:27:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):569:569 -> b
+    26:26:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):565 -> b
+    27:27:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):568:568 -> b
     28:28:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> b
-    28:28:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):570 -> b
+    28:28:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):569 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> b
-    29:29:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):570 -> b
-    30:34:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):570:574 -> b
+    29:29:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):569 -> b
+    30:34:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):569:573 -> b
     35:35:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> b
-    35:35:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):575 -> b
+    35:35:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):574 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     36:36:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> b
-    36:36:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):575 -> b
-    37:37:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):575:575 -> b
+    36:36:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):574 -> b
+    37:37:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):574:574 -> b
     38:38:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> b
-    38:38:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):579 -> b
-    39:39:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):580:580 -> b
+    38:38:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):578 -> b
+    39:39:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):579:579 -> b
     40:40:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> b
-    40:40:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):581 -> b
-    41:52:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):589:600 -> b
-    53:53:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):592:592 -> b
+    40:40:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):580 -> b
+    41:52:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):588:599 -> b
+    53:53:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):591:591 -> b
     54:54:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):124:124 -> b
-    54:54:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):593 -> b
+    54:54:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):592 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     55:55:java.lang.Object com.android.tools.r8.graph.ProgramMethod.registerCodeReferencesWithResult(com.android.tools.r8.graph.UseRegistryWithResult):125:125 -> b
-    55:55:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):593 -> b
-    56:61:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):593:598 -> b
-    62:71:void lambda$run$6(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):740:749 -> b
-    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> c
-    2:27:void initializePinnedTypes(java.lang.Iterable):305:330 -> c
-    28:28:void initializePinnedTypes(java.lang.Iterable):329:329 -> c
-    29:91:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):818:880 -> c
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> d
-    1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1400(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> e
-    1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1500(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> f
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder access$1600(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> g
-    1:1:com.android.tools.r8.graph.DexApplication access$1700(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> h
-    1:1:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():604:604 -> i
-    1:1:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):120 -> i
+    55:55:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):592 -> b
+    56:61:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$3(com.android.tools.r8.graph.ProgramMethod):592:597 -> b
+    1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1000(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> c
+    2:27:void initializePinnedTypes(java.lang.Iterable):304:329 -> c
+    28:28:void initializePinnedTypes(java.lang.Iterable):328:328 -> c
+    29:91:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):797:859 -> c
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> d
+    1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1400(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> e
+    1:1:com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap access$1500(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> f
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder access$1600(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> g
+    1:1:com.android.tools.r8.graph.DexApplication access$1700(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> h
+    1:1:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():603:603 -> i
+    1:1:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):119 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:4:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():605:607 -> i
-    2:4:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):120 -> i
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> j
-    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> k
-    1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> l
-    1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> m
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.B10:
+    2:4:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():604:606 -> i
+    2:4:java.util.Collection access$1800(com.android.tools.r8.shaking.VerticalClassMerger):119 -> i
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> j
+    1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> k
+    1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> l
+    1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):119:119 -> m
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.r10:
 # {"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>():122:122 -> <clinit>
-    1:1:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144:144 -> a
-    2:2:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):208:208 -> a
-    2:2:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    3:3:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):205:205 -> a
-    3:3:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    4:4:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):202:202 -> a
-    4:4:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    5:5:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):199:199 -> a
-    5:5:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    6:6:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):196:196 -> a
-    6:6:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    7:7:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):193:193 -> a
-    7:7:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    8:8:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):190:190 -> a
-    8:8:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    9:9:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):187:187 -> a
-    9:9:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    10:10:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):184:184 -> a
-    10:10:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    11:11:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):181:181 -> a
-    11:11:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    12:12:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):178:178 -> a
-    12:12:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    13:13:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):175:175 -> a
-    13:13:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    14:14:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):172:172 -> a
-    14:14:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    15:15:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):169:169 -> a
-    15:15:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    16:16:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):166:166 -> a
-    16:16:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    17:17:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):163:163 -> a
-    17:17:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    18:18:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):160:160 -> a
-    18:18:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    19:19:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):157:157 -> a
-    19:19:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    20:20:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):154:154 -> a
-    20:20:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    21:80:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):151:210 -> a
-    21:80:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    81:81:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144:144 -> a
-    82:82:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):208:208 -> a
-    82:82:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-    83:83:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):149:149 -> a
-    83:83:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.C10:
+    1:1:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.<clinit>():121:121 -> <clinit>
+    1:1:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143:143 -> a
+    2:2:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):207:207 -> a
+    2:2:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    3:3:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):204:204 -> a
+    3:3:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    4:4:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):201:201 -> a
+    4:4:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    5:5:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):198:198 -> a
+    5:5:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    6:6:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):195:195 -> a
+    6:6:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    7:7:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):192:192 -> a
+    7:7:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    8:8:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):189:189 -> a
+    8:8:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    9:9:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):186:186 -> a
+    9:9:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    10:10:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):183:183 -> a
+    10:10:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    11:11:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):180:180 -> a
+    11:11:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    12:12:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):177:177 -> a
+    12:12:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    13:13:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):174:174 -> a
+    13:13:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    14:14:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):171:171 -> a
+    14:14:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    15:15:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):168:168 -> a
+    15:15:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    16:16:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):165:165 -> a
+    16:16:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    17:17:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):162:162 -> a
+    17:17:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    18:18:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):159:159 -> a
+    18:18:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    19:19:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):156:156 -> a
+    19:19:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    20:20:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):153:153 -> a
+    20:20:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    21:80:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):150:209 -> a
+    21:80:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    81:81:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143:143 -> a
+    82:82:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):207:207 -> a
+    82:82:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+    83:83:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):148:148 -> a
+    83:83:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):143 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.s10:
     com.android.tools.r8.graph.DexProgramClass target -> b
     java.util.List synthesizedBridges -> d
     com.android.tools.r8.graph.DexProgramClass source -> a
@@ -117668,247 +117280,234 @@
     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>():982:982 -> <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):982:982 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):992:992 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):986:994 -> <init>
+    1:1:void <clinit>():961:961 -> <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):961:961 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):971:971 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):965:973 -> <init>
     boolean lambda$getGenericSignatureArgumentApplier$10(com.android.tools.r8.graph.DexType) -> a
     boolean lambda$getGenericSignatureArgumentApplier$9(com.android.tools.r8.graph.DexType,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):1009:1012 -> a
-    5:6:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1017:1018 -> a
-    7:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1652:1661 -> a
-    7:16:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1020 -> a
-    17:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1660:1667 -> a
-    17:24:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1020 -> a
-    25:25: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):347:347 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1667 -> a
-    25:25:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1020 -> a
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):988:991 -> a
+    5:6:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):996:997 -> a
+    7:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1628:1637 -> a
+    7:16:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):999 -> a
+    17:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1636:1643 -> a
+    17:24:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):999 -> a
+    25:25: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):327:327 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1643 -> a
+    25:25:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):999 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    26:26: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):347:347 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1667 -> a
-    26:26:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1020 -> a
-    27: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):1668:1668 -> a
-    27:27:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1020 -> a
-    28:28:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):358:358 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1668 -> a
+    26:26: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):327:327 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1643 -> a
+    26:26:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):999 -> a
+    27:30:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1644:1647 -> a
+    27:30:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):999 -> a
+    31:34:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1730:1733 -> a
+    31:34:void com.android.tools.r8.shaking.VerticalClassMerger.access$1200(com.android.tools.r8.graph.DexEncodedMethod):119 -> a
+    31:34:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1648 -> a
+    31:34:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):999 -> a
+    35:35:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1000:1000 -> a
+    36:36: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):1576:1576 -> a
+    36:36:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1000 -> a
+    37:37:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1001:1001 -> a
+    38:38:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1492:1492 -> a
+    38:38:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1001 -> a
+    39:39:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1007:1007 -> a
+    40:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1654:1654 -> a
+    40:40:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1004 -> a
+    41:41:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1008:1008 -> a
+    42:42: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):1576:1576 -> a
+    42:42:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1008 -> a
+    43:44:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1009:1010 -> a
+    45:45: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):327:327 -> a
+    45:45:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1009 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    28:28:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1020 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1671:1671 -> a
-    29:29:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1020 -> a
-    30:33:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1754:1757 -> a
-    30:33:void com.android.tools.r8.shaking.VerticalClassMerger.access$1200(com.android.tools.r8.graph.DexEncodedMethod):120 -> a
-    30:33:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1672 -> a
-    30:33:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1020 -> a
-    34:34:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1021:1021 -> a
-    35:35: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):1600:1600 -> a
-    35:35:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1021 -> a
-    36:36:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1022:1022 -> a
-    37:37:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1516:1516 -> a
-    37:37:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1022 -> a
-    38:38:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1028:1028 -> a
-    39:39:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1678:1678 -> a
-    39:39:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1025 -> a
-    40:40:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1029:1029 -> a
-    41:41: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):1600:1600 -> a
-    41:41:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1029 -> a
-    42:43:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1030:1031 -> a
-    44:44: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):347:347 -> a
-    44:44:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1030 -> a
+    46:46: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):327:327 -> a
+    46:46:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1009 -> a
+    47:49:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1011:1011 -> a
+    51:51:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1013:1013 -> a
+    52:52:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1492:1492 -> a
+    52:52:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1013 -> a
+    53:62:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1017:1026 -> a
+    63:63:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1021:1021 -> a
+    64:65:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$merge$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1024:1025 -> a
+    66:68:boolean lambda$merge$3(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1095:1097 -> a
+    69:69:boolean lambda$merge$3(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1096:1096 -> a
+    70:70:boolean lambda$merge$4(com.android.tools.r8.graph.DexEncodedMethod):1155:1155 -> a
+    71:71:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    71:71:boolean lambda$merge$4(com.android.tools.r8.graph.DexEncodedMethod):1155 -> a
+    72:72:void lambda$merge$5(com.android.tools.r8.graph.ProgramMethod):1156:1156 -> a
+    73:73:void com.android.tools.r8.graph.DefaultInstanceInitializerCode.uncanonicalizeCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):76:76 -> a
+    73:73:void lambda$merge$5(com.android.tools.r8.graph.ProgramMethod):1156 -> a
+    74:74:boolean lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexField):1173:1173 -> a
+    75:94:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1258:1277 -> a
+    95:98:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):70:73 -> a
+    95:98:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1277 -> a
+    99:138:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1279:1318 -> a
+    139:140:void com.android.tools.r8.utils.CollectionUtils.forEach(java.util.function.Consumer,java.util.Collection[]):30:31 -> a
+    139:140:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1318 -> a
+    141:141:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1332:1332 -> a
+    142:149:void lambda$rewriteGenericSignatures$7(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1320:1327 -> a
+    150:150:void lambda$rewriteGenericSignatures$7(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1324:1324 -> a
+    151:155:void lambda$rewriteGenericSignatures$8(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1334:1338 -> a
+    156:156:void lambda$rewriteGenericSignatures$8(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1337:1337 -> a
+    157:181:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1344:1368 -> a
+    182:182:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1366:1366 -> a
+    183:195:boolean restoreDebuggingState(java.util.stream.Stream):1374:1386 -> a
+    196:196:boolean restoreDebuggingState(java.util.stream.Stream):1385:1385 -> a
+    197:197:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1391:1391 -> a
+    198:226:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1400:1428 -> a
+    227:227:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
+    227:227: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):309 -> a
+    227:227:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1428 -> a
+    228:228: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):309:309 -> a
+    228:228:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1428 -> a
+    229:267:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1431:1469 -> a
+    268:268:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1414:1414 -> a
+    269:269:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$15(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1437:1437 -> a
+    270:273:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1598:1601 -> a
+    274:285:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1700:1711 -> a
+    274:285:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1602 -> a
+    286:292:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1710:1716 -> a
+    286:292:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1602 -> a
+    293:293:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
+    293:293:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1716 -> a
+    293:293:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1602 -> a
+    294:295:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1603:1604 -> a
+    296:296:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    296:296:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1604 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    45:45: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):347:347 -> a
-    45:45:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1030 -> a
-    46:47:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1032:1033 -> a
-    48:48:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):358:358 -> a
-    48:48:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1032 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:49:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1034:1034 -> a
-    50:50:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1516:1516 -> a
-    50:50:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1034 -> a
-    51:60:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1038:1047 -> a
-    61:61:void lambda$merge$2(java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.ProgramMethod):1042:1042 -> a
-    62:63:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$merge$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1045:1046 -> a
-    64:66:boolean lambda$merge$3(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1116:1118 -> a
-    67:67:boolean lambda$merge$3(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1117:1117 -> a
-    68:68:boolean lambda$merge$4(com.android.tools.r8.graph.DexEncodedMethod):1179:1179 -> a
-    69:69:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    69:69:boolean lambda$merge$4(com.android.tools.r8.graph.DexEncodedMethod):1179 -> a
-    70:70:void lambda$merge$5(com.android.tools.r8.graph.ProgramMethod):1180:1180 -> a
-    71:71:void com.android.tools.r8.graph.DefaultInstanceInitializerCode.uncanonicalizeCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):76:76 -> a
-    71:71:void lambda$merge$5(com.android.tools.r8.graph.ProgramMethod):1180 -> a
-    72:72:boolean lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexField):1197:1197 -> a
-    73:92:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1282:1301 -> a
-    93:96:com.android.tools.r8.graph.GenericSignature$ClassSignature com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier.visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):70:73 -> a
-    93:96:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1301 -> a
-    97:136:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1303:1342 -> a
-    137:138:void com.android.tools.r8.utils.CollectionUtils.forEach(java.util.function.Consumer,java.util.Collection[]):30:31 -> a
-    137:138:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1342 -> a
-    139:139:void rewriteGenericSignatures(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,java.util.Collection):1356:1356 -> a
-    140:147:void lambda$rewriteGenericSignatures$7(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1344:1351 -> a
-    148:148:void lambda$rewriteGenericSignatures$7(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):1348:1348 -> a
-    149:153:void lambda$rewriteGenericSignatures$8(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1358:1362 -> a
-    154:154:void lambda$rewriteGenericSignatures$8(com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedField):1361:1361 -> a
-    155:179:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1368:1392 -> a
-    180:180:com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier getGenericSignatureArgumentApplier(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):1390:1390 -> a
-    181:193:boolean restoreDebuggingState(java.util.stream.Stream):1398:1410 -> a
-    194:194:boolean restoreDebuggingState(java.util.stream.Stream):1409:1409 -> a
-    195:195:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1415:1415 -> a
-    196:224:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1424:1452 -> a
-    225:225:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():723:723 -> a
-    225:225: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):322 -> a
-    225:225:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1452 -> a
-    226:226: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):322:322 -> a
-    226:226:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1452 -> a
-    227:265:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1455:1493 -> a
-    266:266:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1438:1438 -> a
-    267:267:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$15(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1461:1461 -> a
-    268:271:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1622:1625 -> a
-    272:283:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1724:1735 -> a
-    272:283:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1626 -> a
-    284:290:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1734:1740 -> a
-    284:290:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1626 -> a
-    291:291:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.graph.DexEncodedField.toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):308:308 -> a
-    291:291:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1740 -> a
-    291:291:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1626 -> a
-    292:293:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1627:1628 -> a
-    294:294:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):343:343 -> a
-    294:294:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1628 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    295:295:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):343:343 -> a
-    295:295:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1628 -> a
-    296:301:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1629:1634 -> a
-    302:302:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1643:1643 -> a
-    303:303:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1951,"2":1952,"3":1953,"4":1954,"5":1955}}
-    1951:1951:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1645:1645 -> a
-    1952:1952:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1645:1645 -> a
-    1953:1953:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1645:1645 -> a
-    1954:1954:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1645:1645 -> a
-    1955:1955:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1645:1645 -> a
-    1950:1950:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1647:1647 -> a
-    1956:1984: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):1688:1716 -> a
-    1985:2009: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):1695:1719 -> a
-    2010:2010: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):1693:1693 -> a
-    1:2:void lambda$restoreDebuggingState$11(com.android.tools.r8.graph.DexEncodedMethod):1400:1401 -> b
-    3:3:java.util.List getSynthesizedBridges():1419:1419 -> b
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$16(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1486:1486 -> b
-    1:2:boolean merge():1001:1002 -> 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):1605:1606 -> c
-    3:4:boolean merge():1002 -> c
-    5:16:boolean merge():1004:1015 -> c
+    297:297:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    297:297:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1604 -> a
+    298:303:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1605:1610 -> a
+    304:304:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1619:1619 -> a
+    305:305:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1929,"2":1930,"3":1931,"4":1932,"5":1933}}
+    1929:1929:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1621:1621 -> a
+    1930:1930:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1621:1621 -> a
+    1931:1931:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1621:1621 -> a
+    1932:1932:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1621:1621 -> a
+    1933:1933:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1621:1621 -> a
+    1928:1928:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1623:1623 -> a
+    1934:1962: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):1664:1692 -> a
+    1963:1987: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):1671:1695 -> a
+    1988:1988: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):1669:1669 -> a
+    1:2:void lambda$restoreDebuggingState$11(com.android.tools.r8.graph.DexEncodedMethod):1376:1377 -> b
+    3:3:java.util.List getSynthesizedBridges():1395:1395 -> b
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$16(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):1462:1462 -> b
+    1:2:boolean merge():980:981 -> 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):1581:1582 -> c
+    3:4:boolean merge():981 -> c
+    5:16:boolean merge():983:994 -> c
     17:17:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):256:256 -> c
-    17:17:boolean merge():1015 -> c
+    17:17:boolean merge():994 -> c
     18:18:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):256:256 -> c
-    18:18:boolean merge():1015 -> c
+    18:18:boolean merge():994 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:boolean merge():1052:1052 -> c
-    20:35:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1570:1585 -> c
-    20:35:boolean merge():1053 -> c
+    19:19:boolean merge():1031:1031 -> c
+    20:35:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1546:1561 -> c
+    20:35:boolean merge():1032 -> c
     36:36:boolean merge():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":315,"2":316,"3":317}}
-    315:315:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1586:1586 -> c
-    315:315:boolean merge():1053 -> c
-    316:316:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1586:1586 -> c
-    316:316:boolean merge():1053 -> c
-    317:317:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1586:1586 -> c
-    317:317:boolean merge():1053 -> c
-    37:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1586:1586 -> c
-    37:37:boolean merge():1053 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":309,"2":310,"3":311}}
+    309:309:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1562:1562 -> c
+    309:309:boolean merge():1032 -> c
+    310:310:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1562:1562 -> c
+    310:310:boolean merge():1032 -> c
+    311:311:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1562:1562 -> c
+    311:311:boolean merge():1032 -> c
+    37:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1562:1562 -> c
+    37:37:boolean merge():1032 -> c
     38:38:boolean merge():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":320,"2":321,"3":322}}
-    320:320:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1589:1589 -> c
-    320:320:boolean merge():1053 -> c
-    321:321:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1589:1589 -> c
-    321:321:boolean merge():1053 -> c
-    322:322:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1589:1589 -> c
-    322:322:boolean merge():1053 -> c
-    39:39:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1591:1591 -> c
-    39:39:boolean merge():1053 -> c
-    40:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1586:1586 -> c
-    40:40:boolean merge():1053 -> c
-    41:46:boolean merge():1055:1060 -> c
-    47:47: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):347:347 -> c
-    47:47:boolean merge():1060 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":314,"2":315,"3":316}}
+    314:314:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1565:1565 -> c
+    314:314:boolean merge():1032 -> c
+    315:315:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1565:1565 -> c
+    315:315:boolean merge():1032 -> c
+    316:316:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1565:1565 -> c
+    316:316:boolean merge():1032 -> c
+    39:39:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1567:1567 -> c
+    39:39:boolean merge():1032 -> c
+    40:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1562:1562 -> c
+    40:40:boolean merge():1032 -> c
+    41:46:boolean merge():1034:1039 -> c
+    47:47: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):327:327 -> c
+    47:47:boolean merge():1039 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    48:48: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):347:347 -> c
-    48:48:boolean merge():1060 -> c
-    49:49:boolean merge():1061:1061 -> c
-    50:50: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):347:347 -> c
-    50:50:boolean merge():1061 -> c
-    51:64:boolean merge():1062:1075 -> c
-    65:77:boolean merge():1074:1086 -> c
-    78:78:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1678:1678 -> c
-    78:78:boolean merge():1091 -> c
-    79:79:boolean merge():1093:1093 -> c
-    80:83:boolean merge():1092:1095 -> c
-    84:84: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):347:347 -> c
-    84:84:boolean merge():1094 -> c
+    48:48: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):327:327 -> c
+    48:48:boolean merge():1039 -> c
+    49:49:boolean merge():1040:1040 -> c
+    50:50: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):327:327 -> c
+    50:50:boolean merge():1040 -> c
+    51:64:boolean merge():1041:1054 -> c
+    65:77:boolean merge():1053:1065 -> c
+    78:78:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1654:1654 -> c
+    78:78:boolean merge():1070 -> c
+    79:79:boolean merge():1072:1072 -> c
+    80:83:boolean merge():1071:1074 -> c
+    84:84: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):327:327 -> c
+    84:84:boolean merge():1073 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:85: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):347:347 -> c
-    85:85:boolean merge():1094 -> c
-    86:87:boolean merge():1096:1097 -> c
-    88:88:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):358:358 -> c
-    88:88:boolean merge():1096 -> c
+    85:85: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):327:327 -> c
+    85:85:boolean merge():1073 -> c
+    86:88:boolean merge():1075:1075 -> c
+    90:90:boolean merge():1077:1077 -> c
+    91:91: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):1576:1576 -> c
+    91:91:boolean merge():1077 -> c
+    92:108:boolean merge():1083:1099 -> c
+    109:109:boolean merge():1092:1092 -> c
+    110:114:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1720:1724 -> c
+    110:114:boolean merge():1100 -> c
+    115:115:boolean merge():1103:1103 -> c
+    116:116:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1654:1654 -> c
+    116:116:boolean merge():1109 -> c
+    117:117:boolean merge():1110:1110 -> c
+    118:122:void com.android.tools.r8.shaking.VerticalClassMerger.makePublic(com.android.tools.r8.graph.DexEncodedMethod):1737:1741 -> c
+    118:122:void com.android.tools.r8.shaking.VerticalClassMerger.access$1100(com.android.tools.r8.graph.DexEncodedMethod):119 -> c
+    118:122:boolean merge():1111 -> c
+    123:126:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1730:1733 -> c
+    123:126:void com.android.tools.r8.shaking.VerticalClassMerger.access$1200(com.android.tools.r8.graph.DexEncodedMethod):119 -> c
+    123:126:boolean merge():1113 -> c
+    127:129:boolean merge():1118:1120 -> c
+    130:130: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):1576:1576 -> c
+    130:130:boolean merge():1117 -> c
+    131:132:boolean merge():1124:1125 -> c
+    133:133:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1492:1492 -> c
+    133:133:boolean merge():1125 -> c
+    134:145: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):1497:1508 -> c
+    134:145:boolean merge():1133 -> c
+    146:152: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):1506:1512 -> c
+    146:152:boolean merge():1133 -> c
+    153:153:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> c
+    153:153: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):1512 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    89:89:boolean merge():1098:1098 -> c
-    90:90: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):1600:1600 -> c
-    90:90:boolean merge():1098 -> c
-    91:107:boolean merge():1104:1120 -> c
-    108:108:boolean merge():1113:1113 -> c
-    109:113:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1744:1748 -> c
-    109:113:boolean merge():1121 -> c
-    114:114:boolean merge():1124:1124 -> c
-    115:115:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1678:1678 -> c
-    115:115:boolean merge():1130 -> c
-    116:116:boolean merge():1131:1131 -> c
-    117:121:void com.android.tools.r8.shaking.VerticalClassMerger.makePublic(com.android.tools.r8.graph.DexEncodedMethod):1761:1765 -> c
-    117:121:void com.android.tools.r8.shaking.VerticalClassMerger.access$1100(com.android.tools.r8.graph.DexEncodedMethod):120 -> c
-    117:121:boolean merge():1132 -> c
-    122:125:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1754:1757 -> c
-    122:125:void com.android.tools.r8.shaking.VerticalClassMerger.access$1200(com.android.tools.r8.graph.DexEncodedMethod):120 -> c
-    122:125:boolean merge():1134 -> c
-    126:128:boolean merge():1139:1141 -> 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):1600:1600 -> c
-    129:129:boolean merge():1138 -> c
-    130:131:boolean merge():1145:1146 -> c
-    132:132:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1516:1516 -> c
-    132:132:boolean merge():1146 -> c
-    133:144: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):1521:1532 -> c
-    133:144:boolean merge():1154 -> c
-    145:151: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):1530:1536 -> c
-    145:151:boolean merge():1154 -> c
-    152:152:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> c
-    152:152: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):1536 -> c
+    153:153:boolean merge():1133 -> c
+    154:180: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):1513:1539 -> c
+    154:180:boolean merge():1133 -> c
+    181:183:boolean merge():1134:1134 -> c
+    185:185:boolean merge():1136:1136 -> c
+    186:186: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):1576:1576 -> c
+    186:186:boolean merge():1136 -> c
+    187:187:boolean merge():1139:1139 -> c
+    188:188: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):327:327 -> c
+    188:188:boolean merge():1139 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    152:152:boolean merge():1154 -> c
-    153:179: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):1537:1563 -> c
-    153:179:boolean merge():1154 -> c
-    180:182:boolean merge():1155:1155 -> c
-    184:184:boolean merge():1157:1157 -> c
-    185:185: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):1600:1600 -> c
-    185:185:boolean merge():1157 -> c
-    186:186:boolean merge():1160:1160 -> c
-    187:187: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):347:347 -> c
-    187:187:boolean merge():1160 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    188:188: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):347:347 -> c
-    188:188:boolean merge():1160 -> c
-    189:193:boolean merge():1161:1161 -> c
-    199:201:boolean merge():1167:1169 -> c
-    202:236:boolean merge():1168:1202 -> c
-    237:246:boolean merge():1200:1209 -> c
-    247:254:boolean merge():1207:1214 -> c
-    255:257:java.util.Set com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.mergeArrays(java.lang.Object[],java.lang.Object[]):1611:1613 -> c
-    255:257:boolean merge():1214 -> c
-    258:294:boolean merge():1217:1253 -> c
-    295:308: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
-    295:308:boolean merge():1253 -> c
-    309:312:boolean merge():1252:1255 -> c
-    313:313:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():59:59 -> c
-    313:313:boolean merge():1255 -> c
-    314:314:boolean merge():1252:1252 -> c
-    323:324:void lambda$restoreDebuggingState$12(com.android.tools.r8.graph.DexEncodedMethod):1405:1406 -> c
-    1:1:boolean lambda$restoreDebuggingState$13(com.android.tools.r8.graph.DexEncodedMethod):1410:1410 -> d
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.D10:
+    189:189: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):327:327 -> c
+    189:189:boolean merge():1139 -> c
+    190:195:boolean merge():1140:1145 -> c
+    196:230:boolean merge():1144:1178 -> c
+    231:240:boolean merge():1176:1185 -> c
+    241:248:boolean merge():1183:1190 -> c
+    249:251:java.util.Set com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.mergeArrays(java.lang.Object[],java.lang.Object[]):1587:1589 -> c
+    249:251:boolean merge():1190 -> c
+    252:288:boolean merge():1193:1229 -> c
+    289:302: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
+    289:302:boolean merge():1229 -> c
+    303:306:boolean merge():1228:1231 -> c
+    307:307:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():59:59 -> c
+    307:307:boolean merge():1231 -> c
+    308:308:boolean merge():1228:1228 -> c
+    317:318:void lambda$restoreDebuggingState$12(com.android.tools.r8.graph.DexEncodedMethod):1381:1382 -> c
+    1:1:boolean lambda$restoreDebuggingState$13(com.android.tools.r8.graph.DexEncodedMethod):1386:1386 -> d
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.t10:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -117917,295 +117516,286 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
     com.android.tools.r8.graph.DexType target -> e
-    1:1:void <clinit>():1847:1847 -> <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):1847:1847 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1858:1858 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1852:1864 -> <init>
-    1:18:void fillSeenPositions():1894:1911 -> a
-    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1901:1902 -> 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):1921:1952 -> a
-    1:22:boolean mayCollide():1868:1889 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.E10:
+    1:1:void <clinit>():1823:1823 -> <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):1823:1823 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1834:1834 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1828:1840 -> <init>
+    1:18:void fillSeenPositions():1870:1887 -> a
+    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1877:1878 -> 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):1897:1928 -> a
+    1:22:boolean mayCollide():1844:1865 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.u10:
     com.android.tools.r8.graph.AppView appView -> f
-    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2103:2104 -> <init>
-    1:2:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2125:2126 -> a
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2079:2080 -> <init>
+    1:2:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2101:2102 -> a
     3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    3:3:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2126 -> a
-    4:7:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2127:2130 -> a
+    3:3:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2102 -> a
+    4:7:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2103:2106 -> a
     8:8:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    8:8:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2130 -> a
-    9:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2135:2139 -> a
+    8:8:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2106 -> a
+    9:13:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2111:2115 -> a
     14:14:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> a
-    14:14:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2139 -> a
+    14:14:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():443:443 -> a
-    15:15:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2139 -> a
-    16:16:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2140:2140 -> a
-    17:18:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2173:2174 -> a
+    15:15:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2115 -> a
+    16:16:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2116:2116 -> a
+    17:18:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2149:2150 -> a
     19:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> a
-    19:19:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2174 -> a
+    19:19:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2150 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2175:2175 -> a
-    21:21:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2206:2206 -> a
+    20:20:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):2151:2151 -> a
+    21:21:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2182:2182 -> a
     22:22:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):468:468 -> a
-    22:22:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2206 -> a
+    22:22:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2182 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:23:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2206:2206 -> a
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):2161:2161 -> b
-    2:3:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2187:2188 -> b
+    23:23:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):2182:2182 -> a
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):2137:2137 -> b
+    2:3:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2163:2164 -> b
     4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> b
-    4:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2188 -> b
+    4:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2164 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2189:2189 -> b
-    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2201:2201 -> c
+    5:5:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):2165:2165 -> b
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2177:2177 -> c
     2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):468:468 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2201 -> c
+    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2177 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2201:2201 -> c
-    4:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):2231:2231 -> c
-    1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2180:2181 -> d
+    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):2177:2177 -> c
+    4:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):2207:2207 -> c
+    1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2156:2157 -> d
     3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> d
-    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2181 -> d
+    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2157 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2182:2182 -> d
-    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):2211:2211 -> d
-    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2216:2216 -> e
+    4:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):2158:2158 -> d
+    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):2187:2187 -> d
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2192:2192 -> e
     2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):468:468 -> e
-    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2216 -> e
+    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2192 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2216:2216 -> e
-    1:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2194:2195 -> f
+    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):2192:2192 -> e
+    1:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2170:2171 -> f
     3:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> f
-    3:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2195 -> f
+    3:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2171 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2196:2196 -> f
-    5:5:void registerTypeReference(com.android.tools.r8.graph.DexType):2226:2226 -> f
-    1:1:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2148:2148 -> g
+    4:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):2172:2172 -> f
+    5:5:void registerTypeReference(com.android.tools.r8.graph.DexType):2202:2202 -> f
+    1:1:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2124:2124 -> g
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> g
-    2:2:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2148 -> g
-    3:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2149:2152 -> g
-    7:8:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2166:2167 -> g
+    2:2:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2124 -> g
+    3:6:boolean checkTypeReference(com.android.tools.r8.graph.DexType):2125:2128 -> g
+    7:8:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2142:2143 -> g
     9:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):430:430 -> g
-    9:9:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2167 -> g
+    9:9:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2143 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2168:2168 -> g
-    11:11:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2221:2221 -> g
+    10:10:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):2144:2144 -> g
+    11:11:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2197:2197 -> g
     12:12:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.lookupField(com.android.tools.r8.graph.DexField):468:468 -> g
-    12:12:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2221 -> g
+    12:12:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2197 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2221:2221 -> g
-    1:2:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2108:2109 -> i
+    13:13:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):2197:2197 -> g
+    1:2:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2084:2085 -> i
     3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> i
-    3:3:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2109 -> i
-    4:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2110:2117 -> i
-com.android.tools.r8.shaking.VerticalClassMerger$InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.F10:
+    3:3:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2085 -> i
+    4:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2086:2093 -> i
+com.android.tools.r8.shaking.VerticalClassMerger$InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.v10:
     boolean $assertionsDisabled -> f
-    1:1:void <clinit>():2235:2235 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2240:2241 -> <init>
+    1:1:void <clinit>():2211:2211 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2216:2217 -> <init>
     void registerInstanceFieldRead(com.android.tools.r8.graph.DexField) -> a
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
     void registerInitClass(com.android.tools.r8.graph.DexType) -> b
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
-    1:8:void registerInvokeSpecial(com.android.tools.r8.graph.DexMethod):2246:2253 -> c
+    1:8:void registerInvokeSpecial(com.android.tools.r8.graph.DexMethod):2222:2229 -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> d
     void registerStaticFieldRead(com.android.tools.r8.graph.DexField) -> e
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> f
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.G10:
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.w10:
     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):618:618 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):613:621 -> <init>
-    1:35:java.util.Collection get():626:660 -> a
-    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):644:644 -> a
-    37:41:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):668:672 -> a
-    42:49:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):688:695 -> a
-    42:49:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):672 -> a
-    50:50:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):675:675 -> a
-    51:58:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):688:695 -> a
-    51:58:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):676 -> a
-    59:59:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):682:682 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.H10:
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):617:617 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):612:620 -> <init>
+    1:35:java.util.Collection get():625:659 -> a
+    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):643:643 -> a
+    37:41:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):667:671 -> a
+    42:49:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):687:694 -> a
+    42:49:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):671 -> a
+    50:50:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):674:674 -> a
+    51:58:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):687:694 -> a
+    51:58:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):675 -> a
+    59:59:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):681:681 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.x10:
     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>():1986:1986 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1991:1994 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1999:1999 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):2009:2009 -> a
-    3:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):2014:2014 -> a
-    4:24: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,com.android.tools.r8.graph.GraphLens):2042:2062 -> a
-    25:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):2069:2069 -> a
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):2004:2004 -> b
-    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):2019:2019 -> b
-    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):2086:2086 -> b
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):2080:2080 -> c
-    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):2024:2024 -> d
-    2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):2075:2075 -> d
-    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):2029:2029 -> e
+    1:1:void <clinit>():1962:1962 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1967:1970 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1975:1975 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1985:1985 -> a
+    3:3:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):1990:1990 -> a
+    4:24: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,com.android.tools.r8.graph.GraphLens):2018:2038 -> a
+    25:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):2045:2045 -> a
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1980:1980 -> b
+    2:2:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1995:1995 -> b
+    3:3:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens):2056:2056 -> b
+    4:4:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):2062:2062 -> b
+    1:1:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):2051:2051 -> c
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):2000:2000 -> d
+    1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):2005:2005 -> e
     boolean isContextFreeForMethods() -> g
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.I10:
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.y10:
     com.android.tools.r8.ir.code.Invoke$Type type -> g
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod invocationTarget -> f
     com.android.tools.r8.graph.DexMethod originalMethod -> e
     com.android.tools.r8.graph.DexMethod method -> d
     boolean isInterface -> h
-    1:1:void <clinit>():2291:2291 -> <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):2304:2309 -> <init>
-    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2330:2331 -> A0
-    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 -> A0
-    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2331 -> A0
-    4:7:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2332:2335 -> A0
-    8:8:boolean com.android.tools.r8.ir.code.Invoke$Type.isStatic():189:189 -> A0
-    8:8:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2335 -> A0
-    9:13:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2335:2339 -> A0
-    1:1:com.android.tools.r8.graph.DexMethod access$1900(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):2291:2291 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):2324:2325 -> a
-    4:4:java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod):2344:2344 -> a
-    5:17:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2345:2357 -> a
+    1:1:void <clinit>():2267:2267 -> <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):2280:2285 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):2267:2267 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):2300:2301 -> a
+    4:4:java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod):2320:2320 -> a
+    5:17:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2321:2333 -> a
     18:18:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2386,"2":2387,"3":2388}}
-    2386:2386:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2357:2357 -> a
-    2387:2387:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2357:2357 -> a
-    2388:2388:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2357:2357 -> a
-    2375:2375:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2357:2357 -> a
-    2376:2376:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2351:2351 -> a
-    2377:2377:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2348:2348 -> a
-    1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):2291:2291 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.J10:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2362,"2":2363,"3":2364}}
+    2362:2362:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2333:2333 -> a
+    2363:2363:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2333:2333 -> a
+    2364:2364:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2333:2333 -> a
+    2351:2351:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2333:2333 -> a
+    2352:2352:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2327:2327 -> a
+    2353:2353:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2324:2324 -> a
+    1:2:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2306:2307 -> z0
+    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 -> z0
+    3:3:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2307 -> z0
+    4:7:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2308:2311 -> z0
+    8:8:boolean com.android.tools.r8.ir.code.Invoke$Type.isStatic():189:189 -> z0
+    8:8:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2311 -> z0
+    9:13:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2311:2315 -> z0
+com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.z10:
     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>():1768:1768 -> <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):1780:1785 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1768:1768 -> a
-    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1816:1816 -> a
-    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1821:1821 -> a
-    4:4:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):330:330 -> a
-    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1821 -> a
+    1:1:void <clinit>():1744:1744 -> <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):1756:1761 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$400(com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer):1744:1744 -> a
+    2:2:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1792:1792 -> a
+    3:3:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1797:1797 -> a
+    4:4:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):310:310 -> a
+    4:4:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1797 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):330:330 -> a
-    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1821 -> a
-    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1822:1822 -> a
-    7:7:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):343:343 -> a
-    7:7:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1822 -> a
+    5:5:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):310:310 -> a
+    5:5:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1797 -> a
+    6:6:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1798:1798 -> a
+    7:7:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    7:7:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1798 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):343:343 -> a
-    8:8:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1822 -> a
-    9:10:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1828:1829 -> a
-    11:11:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):358:358 -> a
-    11:11:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1829 -> a
-    12:17:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1836:1841 -> a
-    1:3:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1790:1792 -> b
+    8:8:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    8:8:void recordFieldChange(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):1798 -> a
+    9:10:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1804:1805 -> a
+    11:16:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1812:1817 -> a
+    1:3:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1766:1768 -> b
     4:4:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.graph.TreeFixerBase.fixupFields(java.util.List):170:170 -> b
-    4:4:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1792 -> b
-    5:6:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1792:1793 -> b
+    4:4:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1768 -> b
+    5:6:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1768:1769 -> b
     7:7:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.graph.TreeFixerBase.fixupFields(java.util.List):170:170 -> b
-    7:7:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1793 -> b
-    8:15:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1793:1800 -> b
-    16:17:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1807:1808 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.N10:
+    7:7:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1769 -> b
+    8:15:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1769:1776 -> b
+    16:17:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1783:1784 -> b
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.D10:
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map originalMethodSignaturesForBridges -> r
-    java.util.Map prototypeChanges -> s
     java.util.Map contextualVirtualToDirectMethodMaps -> p
     java.util.Set mergedMethods -> q
     com.android.tools.r8.graph.classmerging.VerticallyMergedClasses mergedClasses -> o
-    boolean $assertionsDisabled -> t
-    1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Map,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1):57:57 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Map):84:90 -> <init>
-    1:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):111:137 -> a
-    28:30:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):136:138 -> a
-    31:31:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.shaking.VerticalClassMergerGraphLens.mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):157:157 -> a
-    31:31:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):138 -> a
-    32:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):138:139 -> a
-    34:36:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):145:145 -> a
-    37:37: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):157:157 -> a
-    38:38:boolean lambda$verifyIsContextFreeForMethod$0(com.android.tools.r8.graph.DexMethod,java.util.Map):170:170 -> a
-    1:4:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):167:170 -> d
-    5:5:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):169:169 -> d
-    1:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):151:151 -> e
-    1:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):100:101 -> f
+    boolean $assertionsDisabled -> s
+    1:1:void <clinit>():55:55 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1):55:55 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,java.util.Set,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map):80:85 -> <init>
+    1:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):106:132 -> a
+    28:30:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):131:133 -> a
+    31:31:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.shaking.VerticalClassMergerGraphLens.mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):145:145 -> a
+    31:31:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):133 -> a
+    32:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):133:134 -> a
+    34:34: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):145:145 -> a
+    35:35:boolean lambda$verifyIsContextFreeForMethod$0(com.android.tools.r8.graph.DexMethod,java.util.Map):158:158 -> a
+    1:4:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):155:158 -> d
+    5:5:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):157:157 -> d
+    1:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):139:139 -> e
+    1:2:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):95:96 -> f
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> f
-    3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):105 -> f
-    1:1:boolean isContextFreeForMethods():162:162 -> g
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.L10:
+    3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):100 -> f
+    1:1:boolean isContextFreeForMethods():150:150 -> g
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.B10:
     java.util.Map methodMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> f
-    boolean $assertionsDisabled -> j
-    java.util.Map cache -> i
+    boolean $assertionsDisabled -> i
     java.util.Map contextualVirtualToDirectMethodMaps -> e
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap fieldMap -> b
     java.util.Map originalMethodSignaturesForBridges -> g
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder mergedMethodsBuilder -> d
-    java.util.Map prototypeChanges -> h
-    1:1:void <clinit>():174:174 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):194:194 -> <init>
-    2:19:void <init>(com.android.tools.r8.graph.DexItemFactory):178:195 -> <init>
-    1:9:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):199:207 -> a
-    10:10: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):347:347 -> a
-    10:10:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):205 -> a
-    11:13:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):209:211 -> a
-    14:14:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.markMethodAsMerged(com.android.tools.r8.graph.DexMethod):339:339 -> a
-    14:14:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):210 -> a
-    15:17:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):214:216 -> a
-    18:26:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):309:317 -> a
-    18:26:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):216 -> a
-    27:57:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):216:246 -> a
-    58:58:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):377:377 -> a
-    58:58:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):244 -> a
-    59:59:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):248:248 -> a
-    60:60:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):203:203 -> a
-    61:66:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):276:281 -> a
-    61:66:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):203 -> a
-    67:75:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):309:317 -> a
-    67:75:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):282 -> a
-    67:75:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):203 -> a
-    76:76:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):287:287 -> a
-    76:76:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):203 -> a
-    77:77:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):343:343 -> a
-    77:77:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):202 -> a
+    java.util.Map cache -> h
+    1:1:void <clinit>():162:162 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):180:180 -> <init>
+    2:17:void <init>(com.android.tools.r8.graph.DexItemFactory):166:181 -> <init>
+    1:9:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):185:193 -> a
+    10:10: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):327:327 -> a
+    10:10:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):191 -> a
+    11:13:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):195:197 -> a
+    14:14:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.markMethodAsMerged(com.android.tools.r8.graph.DexMethod):319:319 -> a
+    14:14:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):196 -> a
+    15:17:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):200:202 -> a
+    18:26:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):289:297 -> a
+    18:26:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):202 -> a
+    27:57:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):202:232 -> a
+    58:58:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):342:342 -> a
+    58:58:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):230 -> a
+    59:59:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189:189 -> a
+    60:65:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):256:261 -> a
+    60:65:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189 -> a
+    66:74:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):289:297 -> a
+    66:74:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):262 -> a
+    66:74:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189 -> a
+    75:75:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):267:267 -> a
+    75:75:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189 -> a
+    76:76:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    76:76:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):188 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    78:78:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):343:343 -> a
-    78:78:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):202 -> a
-    79:79:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$createBuilderForFixup$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):227:227 -> a
-    80:84:void lambda$createBuilderForFixup$2(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):234:238 -> a
-    85:87:void lambda$createBuilderForFixup$3(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):250:250 -> a
-    88:97:com.android.tools.r8.shaking.VerticalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):258:267 -> a
-    98:111:com.android.tools.r8.graph.DexMethod getMethodSignatureAfterClassMerging(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):292:305 -> a
-    112:120:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):309:317 -> a
-    112:120:com.android.tools.r8.graph.DexType lambda$getMethodSignatureAfterClassMerging$4(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexType):300 -> a
-    121:124:boolean hasMappingForSignatureInContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):321:324 -> a
-    125:126:boolean hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexMethod):334:335 -> a
-    127:136:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):362:371 -> a
-    137:144:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):365:372 -> a
-    145:147:void mapVirtualMethodToDirectInType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider,com.android.tools.r8.graph.DexType):382:384 -> a
-    148:148:java.util.Map lambda$mapVirtualMethodToDirectInType$5(com.android.tools.r8.graph.DexType):383:383 -> a
-    149:194:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder):388:433 -> a
-    195:195:void lambda$merge$7(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):393:393 -> a
-    196:196:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
-    196:196:void lambda$merge$7(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):394 -> a
-    197:213:void lambda$merge$7(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):399:415 -> a
-    214:219:void lambda$merge$7(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):414:419 -> a
-    220:220:boolean lambda$merge$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):394:394 -> a
-    1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):339:339 -> b
-    2:2:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):347:347 -> b
-    1:1:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):377:377 -> c
-    1:3:void recordMerge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):352:354 -> d
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.M10:
+    77:77:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):323:323 -> a
+    77:77:void lambda$createBuilderForFixup$0(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):188 -> a
+    78:78:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$createBuilderForFixup$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):213:213 -> a
+    79:83:void lambda$createBuilderForFixup$2(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):220:224 -> a
+    84:93:com.android.tools.r8.shaking.VerticalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):239:248 -> a
+    94:107:com.android.tools.r8.graph.DexMethod getMethodSignatureAfterClassMerging(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):272:285 -> a
+    108:116:com.android.tools.r8.graph.DexType com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getTypeAfterClassMerging(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):289:297 -> a
+    108:116:com.android.tools.r8.graph.DexType lambda$getMethodSignatureAfterClassMerging$3(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses,com.android.tools.r8.graph.DexType):280 -> a
+    117:120:boolean hasMappingForSignatureInContext(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):301:304 -> a
+    121:122:boolean hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexMethod):314:315 -> a
+    123:125:void mapVirtualMethodToDirectInType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider,com.android.tools.r8.graph.DexType):347:349 -> a
+    126:126:java.util.Map lambda$mapVirtualMethodToDirectInType$4(com.android.tools.r8.graph.DexType):348:348 -> a
+    127:171:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder):353:397 -> a
+    172:172:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):358:358 -> a
+    173:173:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
+    173:173:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):359 -> a
+    174:190:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):364:380 -> a
+    191:196:void lambda$merge$6(java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):379:384 -> a
+    197:197:boolean lambda$merge$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):359:359 -> a
+    1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):319:319 -> b
+    2:2:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):327:327 -> b
+    1:1:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):342:342 -> c
+    1:3:void recordMerge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):332:334 -> d
+    1:1:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):338:338 -> e
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.C10:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult get(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription) -> a
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.m20:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.c20:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -118259,7 +117849,7 @@
     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.k20:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.a20:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -118275,7 +117865,7 @@
     2:3:void com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter.indent():268:269 -> c
     2:3:void startItem(java.lang.String):263 -> c
     4:4:void startItem(java.lang.String):264:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.l20:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.b20:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
@@ -118417,7 +118007,7 @@
     1:1:java.util.List lambda$addNonLegacyClass$0(com.android.tools.r8.graph.DexType):59:59 -> b
     2:9:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder collectSyntheticInputs():87:94 -> b
     1:1:java.util.List lambda$addNonLegacyMethod$1(com.android.tools.r8.graph.DexType):73:73 -> c
-com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.AT:
+com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.qT:
     com.android.tools.r8.synthesis.Rewritable rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens) -> a
     com.android.tools.r8.graph.DexType getHolder() -> b
 com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.synthesis.d:
@@ -118457,10 +118047,10 @@
     28:28:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116 -> a
     29:31:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):118:120 -> a
     32:32:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128:128 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     33:33:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():446:446 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():445:445 -> a
     34:34:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> a
     35:50:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131:146 -> a
     51:51:boolean isDerivedFromMainDexList(com.android.tools.r8.shaking.MainDexInfo):159:159 -> a
@@ -118469,24 +118059,24 @@
     1:1:com.android.tools.r8.graph.DexType getSynthesizingContextType():103:103 -> c
     1:1:int compareTo(java.lang.Object):29:29 -> compareTo
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":310,"2":311,"3":312}}
-    310:310:java.lang.String toString():151:151 -> toString
-    311:311:java.lang.String toString():151:151 -> toString
-    312:312:java.lang.String toString():151:151 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":160,"2":161,"3":162}}
+    160:160:java.lang.String toString():151:151 -> toString
+    161:161:java.lang.String toString():151:151 -> toString
+    162:162:java.lang.String toString():151:151 -> toString
     2:2:com.android.tools.r8.graph.DexType getSynthesizingContextType():103:103 -> toString
     2:2:java.lang.String toString():152 -> toString
     3:4:java.lang.String toString():152:153 -> toString
     5:5:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":314,"2":315,"3":316}}
-    314:314:java.lang.String toString():153:153 -> toString
-    315:315:java.lang.String toString():153:153 -> toString
-    316:316:java.lang.String toString():153:153 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":160,"2":161,"3":162}}
+    160:160:java.lang.String toString():153:153 -> toString
+    161:161:java.lang.String toString():153:153 -> toString
+    162:162:java.lang.String toString():153:153 -> toString
     158:158:java.lang.String toString():153:153 -> toString
     159:159:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":317,"2":318,"3":319}}
-    317:317:java.lang.String toString():153:153 -> toString
-    318:318:java.lang.String toString():153:153 -> toString
-    319:319:java.lang.String toString():153:153 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":160,"2":161,"3":162}}
+    160:160:java.lang.String toString():153:153 -> toString
+    161:161:java.lang.String toString():153:153 -> toString
+    162:162:java.lang.String toString():153:153 -> toString
 com.android.tools.r8.synthesis.SyntheticClassBuilder -> com.android.tools.r8.synthesis.e:
     com.android.tools.r8.graph.GenericSignature$ClassSignature signature -> r
     java.util.List methods -> q
@@ -118581,10 +118171,10 @@
     126:126:java.lang.String toString():58:58 -> toString
     59:59:java.lang.String toString():58:58 -> toString
     60:60:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":127,"2":128,"3":129}}
-    127:127:java.lang.String toString():59:59 -> toString
-    128:128:java.lang.String toString():59:59 -> toString
-    129:129:java.lang.String toString():59:59 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":124,"2":125,"3":126}}
+    124:124:java.lang.String toString():59:59 -> toString
+    125:125:java.lang.String toString():59:59 -> toString
+    126:126:java.lang.String toString():59:59 -> toString
     121:123:java.lang.String toString():61:63 -> toString
 com.android.tools.r8.synthesis.SyntheticClasspathClassReference -> com.android.tools.r8.synthesis.j:
     boolean $assertionsDisabled -> e
@@ -118624,7 +118214,7 @@
     24:24:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
     17:17:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):42:42 -> a
     17:17: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.MX:
+com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.CX:
 com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synthesis.k:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
     boolean $assertionsDisabled -> c
@@ -118688,7 +118278,7 @@
     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.NX:
+com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.DX:
     com.android.tools.r8.graph.ClassResolutionResult 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
@@ -118785,11 +118375,11 @@
     844:844:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535:535 -> a
     845:845: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
     845:845:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    846:846:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    846:846:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     846:846: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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     846:846:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    847:847:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    847:847:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     847:847: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
     847:847:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
     848:853: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
@@ -118946,12 +118536,12 @@
     1789:1789:java.lang.String toString():887:887 -> toString
     889:892:java.lang.String toString():887:890 -> toString
     893:893:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1795,"2":1796,"3":1797}}
-    1795:1795:java.lang.String toString():893:893 -> toString
-    1796:1796:java.lang.String toString():893:893 -> toString
-    1797:1797:java.lang.String toString():893:893 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1787,"2":1788,"3":1789}}
+    1787:1787:java.lang.String toString():893:893 -> toString
+    1788:1788:java.lang.String toString():893:893 -> toString
+    1789:1789:java.lang.String toString():893:893 -> toString
     1786:1786:java.lang.String toString():893:893 -> toString
-com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.OX:
+com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.EX:
     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
@@ -119283,10 +118873,10 @@
     1048:1048: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):853 -> a
     1049:1060: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):853:864 -> a
     1061:1061:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):870:870 -> a
-    1062:1062:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    1062:1062:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     1062:1062:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):870 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1063:1063:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
+    1063:1063:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
     1063:1063:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):870 -> a
     1064:1071:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):873:880 -> a
     1072:1072: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
@@ -119373,7 +118963,7 @@
     5:5:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):83:83 -> a
     6:12:java.util.Collection getAllProgramClasses():88:94 -> a
     1:1:boolean isEmpty():70:70 -> b
-com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.RX:
+com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.HX:
     java.util.Set getSynthesizingContexts(com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.synthesis.SyntheticMarker -> com.android.tools.r8.synthesis.t:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
@@ -119521,7 +119111,7 @@
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):115:115 -> b
     2:2:com.android.tools.r8.synthesis.SyntheticMethodBuilder disableAndroidApiLevelCheck():125:125 -> b
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):63:63 -> c
-com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.UX:
+com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.KX:
     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.v:
     com.android.tools.r8.graph.ProgramMethod method -> d
@@ -119826,10 +119416,10 @@
     146:146:java.lang.String toString():68:68 -> toString
     69:69:java.lang.String toString():68:68 -> toString
     70:70:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":147,"2":148,"3":149}}
-    147:147:java.lang.String toString():69:69 -> toString
-    148:148:java.lang.String toString():69:69 -> toString
-    149:149:java.lang.String toString():69:69 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":144,"2":145,"3":146}}
+    144:144:java.lang.String toString():69:69 -> toString
+    145:145:java.lang.String toString():69:69 -> toString
+    146:146:java.lang.String toString():69:69 -> toString
     141:143:java.lang.String toString():71:73 -> toString
 com.android.tools.r8.synthesis.SyntheticProgramClassReference -> com.android.tools.r8.synthesis.A:
     boolean $assertionsDisabled -> e
@@ -119844,7 +119434,7 @@
     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.VX:
+com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.LX:
     void apply(java.util.function.Consumer,java.util.function.Consumer) -> a
     com.android.tools.r8.graph.DexProgramClass getHolder() -> b
 com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.synthesis.B:
@@ -120584,15 +120174,15 @@
     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.D9:
+com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.C9:
     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.xj:
+com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.sj:
     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.lE:
+com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.eE:
     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.JY:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.android.tools.r8.internal.zY:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -120602,7 +120192,7 @@
     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.IY:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.yY:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -120615,22 +120205,22 @@
     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.LY:
+com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.BY:
     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.MY:
+com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.CY:
     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.NY:
+com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.DY:
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,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.OY:
+com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.EY:
     com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> b
     boolean $assertionsDisabled -> e
     java.lang.Object accessFlags -> c
@@ -120955,16 +120545,16 @@
     1:1:void <init>():743:743 -> <init>
     1:1:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):754:754 -> a
     1:1:java.lang.String getDescriptor():0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1518,"2":1519,"3":1520}}
-    1518:1518:java.lang.String getDescriptor():758:758 -> b
-    1519:1519:java.lang.String getDescriptor():758:758 -> b
-    1520:1520:java.lang.String getDescriptor():758:758 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":761,"2":762,"3":763}}
+    761:761:java.lang.String getDescriptor():758:758 -> b
+    762:762:java.lang.String getDescriptor():758:758 -> b
+    763:763:java.lang.String getDescriptor():758:758 -> b
     759:759:java.lang.String getDescriptor():758:758 -> b
     760:760:java.lang.String getDescriptor():0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1521,"2":1522,"3":1523}}
-    1521:1521:java.lang.String getDescriptor():758:758 -> b
-    1522:1522:java.lang.String getDescriptor():758:758 -> b
-    1523:1523:java.lang.String getDescriptor():758:758 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":761,"2":762,"3":763}}
+    761:761:java.lang.String getDescriptor():758:758 -> b
+    762:762:java.lang.String getDescriptor():758:758 -> b
+    763:763:java.lang.String getDescriptor():758:758 -> b
 com.android.tools.r8.utils.AndroidApp$2 -> com.android.tools.r8.utils.d:
     java.util.Map val$classPathResources -> b
     1:1:void <init>(java.util.Map):561:561 -> <init>
@@ -121220,7 +120810,7 @@
     java.util.Set descriptors -> a
     1:1:void <init>(java.util.Set,byte[],com.android.tools.r8.utils.AndroidAppConsumers$1):328:328 -> <init>
     2:4:void <init>(java.util.Set,byte[]):333:335 -> <init>
-com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.internal.F2:
+com.android.tools.r8.utils.ArchiveBuilder -> com.android.tools.r8.internal.E2:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.origin.Origin origin -> b
     java.util.zip.ZipOutputStream stream -> c
@@ -121350,7 +120940,7 @@
     320:320:com.android.tools.r8.origin.Origin getOrigin():185:185 -> a
     1:1:java.nio.file.Path getPath():190:190 -> b
     1:2:void open():46:47 -> c
-com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.internal.E2:
+com.android.tools.r8.utils.ArchiveBuilder$DelayedData -> com.android.tools.r8.internal.D2:
     com.android.tools.r8.ByteDataView content -> c
     java.lang.String name -> b
     boolean isDirectory -> d
@@ -121456,7 +121046,7 @@
     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.r3:
+com.android.tools.r8.utils.ArrayUtils -> com.android.tools.r8.internal.q3:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -121469,9 +121059,9 @@
     36:45:java.lang.Object[] filter(java.lang.Object[],java.util.function.Predicate,java.lang.Object[],int):107:116 -> a
     46:47:java.lang.Object[] appendSingleElement(java.lang.Object[],java.lang.Object):160:161 -> a
     1:1:java.lang.Object last(java.lang.Object[]):66:66 -> b
-com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.x3:
+com.android.tools.r8.utils.AsmUtils -> com.android.tools.r8.internal.w3:
     boolean isDeprecated(int) -> a
-com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.z3:
+com.android.tools.r8.utils.AssertionConfigurationWithDefault -> com.android.tools.r8.internal.y3:
     java.util.List assertionsConfigurations -> b
     com.android.tools.r8.AssertionsConfiguration defaultConfiguration -> a
     java.util.List allAssertionHandlers -> c
@@ -121481,34 +121071,34 @@
     1:6:java.util.List computeAllAssertionHandlers():45:50 -> a
     7:9:void lambda$computeAllAssertionHandlers$0(java.util.List,com.android.tools.r8.AssertionsConfiguration):52:54 -> a
     1:1:java.util.List getAllAssertionHandlers():41:41 -> b
-com.android.tools.r8.utils.AssertionUtils -> com.android.tools.r8.internal.A3:
+com.android.tools.r8.utils.AssertionUtils -> com.android.tools.r8.internal.z3:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean assertNotNull(java.lang.Object):12:12 -> a
-com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.J4:
-com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.L4:
+com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.I4:
+com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.K4:
     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.M4:
+com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.L4:
     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.BitSetUtils -> com.android.tools.r8.internal.h5:
+com.android.tools.r8.utils.BitSetUtils -> com.android.tools.r8.internal.g5:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27:27 -> a
     2:3:java.util.BitSet com.android.tools.r8.utils.BitSetUtils.or(java.util.BitSet,java.util.BitSet):21:22 -> a
     2:3:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27 -> a
     4:4:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27:27 -> a
-com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.i5:
+com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.h5:
     boolean isBitInMaskSet(int,int) -> a
     boolean isBitSet(int,int) -> b
-com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.m5:
+com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.l5:
     boolean value -> a
     boolean assigned -> b
     1:1:void <init>():14:14 -> <init>
@@ -121525,7 +121115,7 @@
     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.w5:
+com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.v5:
     1:1:void <init>():27:27 -> <init>
     boolean isFalse() -> a
     1:1:boolean isPossiblyFalse():52:52 -> b
@@ -121533,14 +121123,14 @@
     boolean isTrue() -> d
     boolean isUnknown() -> e
     1:1:int hashCode():74:74 -> hashCode
-com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.D5:
+com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.C5:
     java.lang.Boolean[] VALUES -> a
     int $r8$clinit -> b
     1:1:void <clinit>():8:8 -> <clinit>
     int intValue(boolean) -> a
     boolean xor(boolean,boolean) -> a
     1:1:java.lang.Boolean[] values():21:21 -> a
-com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.S5:
+com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.R5:
     java.lang.Object value -> a
     1:1:void <init>():15:15 -> <init>
     2:3:void <init>(java.lang.Object):17:18 -> <init>
@@ -121551,7 +121141,7 @@
     1:1:boolean isSet():43:43 -> c
     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.K7:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.J7:
     java.util.Map sourceMethodMapping -> a
     com.android.tools.r8.utils.AndroidApp inputApp -> b
     boolean $assertionsDisabled -> c
@@ -121562,7 +121152,7 @@
     2:7:java.lang.String lookupNameAndDescriptor(java.lang.String,int):31:36 -> a
     8:30:void readLineNumbersFromClassFiles():40:62 -> a
     31:36:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):46:51 -> a
-com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.I7:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.H7:
     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>
@@ -121580,13 +121170,13 @@
     120:120: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
     114:114: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.J7:
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.I7:
     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.X8:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.W8:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
     int nextUnusedValue -> c
@@ -121612,14 +121202,14 @@
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49 -> d
     3:3:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):50:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.Z8:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.Y8:
     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.Y8:
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.X8:
     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.oa:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.na:
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -121630,56 +121220,48 @@
     com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass) -> a
     1:6:java.util.function.Supplier lambda$get$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):106:111 -> a
     7:12:void clearType(com.android.tools.r8.graph.DexType):123:128 -> a
-    13:17:java.lang.Iterable getAllClassProviderTypes():167:171 -> a
-    18:18:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    18:18:java.lang.Iterable getAllClassProviderTypes():171 -> a
-    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    19:19:java.lang.Iterable getAllClassProviderTypes():171 -> a
-    20:20:java.lang.Iterable getAllClassProviderTypes():171:171 -> a
-    21:79:void forceLoad(java.util.function.Predicate):187:245 -> a
+    13:23:java.util.List getAllClasses():135:145 -> a
+    24:24:java.util.List getAllClasses():136:136 -> a
+    25:83:void forceLoad(java.util.function.Predicate):178:236 -> a
     1:28:com.android.tools.r8.graph.DexClass get(com.android.tools.r8.graph.DexType):88:115 -> b
     29:29:com.android.tools.r8.graph.DexClass get(com.android.tools.r8.graph.DexType):113:113 -> b
-    30:40:java.util.List getAllClasses():135:145 -> b
-    41:41:java.util.List getAllClasses():136:136 -> b
-    1:9:com.android.tools.r8.com.google.common.collect.ImmutableMap getAllClassesInMap():151:159 -> c
-    10:10:com.android.tools.r8.com.google.common.collect.ImmutableMap getAllClassesInMap():152:152 -> c
-    1:1:java.lang.Iterable getAllTypes():163:163 -> d
-    com.android.tools.r8.graph.ClassKind getClassKind() -> e
-    1:1:boolean isFullyLoaded():249:249 -> f
+    30:38:com.android.tools.r8.com.google.common.collect.ImmutableMap getAllClassesInMap():151:159 -> b
+    39:39:com.android.tools.r8.com.google.common.collect.ImmutableMap getAllClassesInMap():152:152 -> b
+    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$ConcurrentClassLoader -> com.android.tools.r8.internal.na:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.ma:
     com.android.tools.r8.graph.DexType type -> d
     boolean ready -> f
     boolean $assertionsDisabled -> g
     com.android.tools.r8.graph.DexClass clazz -> e
     com.android.tools.r8.utils.ClassMap classMap -> b
     com.android.tools.r8.utils.ClassProvider provider -> c
-    1:1:void <clinit>():255:255 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.ClassMap,com.android.tools.r8.utils.ClassProvider,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.ClassMap$1):255:255 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.ClassMap,com.android.tools.r8.utils.ClassProvider,com.android.tools.r8.graph.DexType):264:264 -> <init>
-    3:9:void <init>(com.android.tools.r8.utils.ClassMap,com.android.tools.r8.utils.ClassProvider,com.android.tools.r8.graph.DexType):261:267 -> <init>
-    1:41:com.android.tools.r8.graph.DexClass get():272:312 -> a
-    42:42:com.android.tools.r8.graph.DexClass get():308:308 -> a
-    43:62:void lambda$get$0(com.android.tools.r8.graph.DexClass):280:299 -> a
-    63:63:void lambda$get$0(com.android.tools.r8.graph.DexClass):285:285 -> a
+    1:1:void <clinit>():246:246 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.ClassMap,com.android.tools.r8.utils.ClassProvider,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.ClassMap$1):246:246 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.ClassMap,com.android.tools.r8.utils.ClassProvider,com.android.tools.r8.graph.DexType):255:255 -> <init>
+    3:9:void <init>(com.android.tools.r8.utils.ClassMap,com.android.tools.r8.utils.ClassProvider,com.android.tools.r8.graph.DexType):252:258 -> <init>
+    1:41:com.android.tools.r8.graph.DexClass get():263:303 -> a
+    42:42:com.android.tools.r8.graph.DexClass get():299:299 -> a
+    43:62:void lambda$get$0(com.android.tools.r8.graph.DexClass):271:290 -> a
+    63:63:void lambda$get$0(com.android.tools.r8.graph.DexClass):276:276 -> a
     64:64:void lambda$get$0(com.android.tools.r8.graph.DexClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":640,"2":641,"3":642}}
-    640:640:void lambda$get$0(com.android.tools.r8.graph.DexClass):285:285 -> a
-    641:641:void lambda$get$0(com.android.tools.r8.graph.DexClass):285:285 -> a
-    642:642:void lambda$get$0(com.android.tools.r8.graph.DexClass):285:285 -> a
-    349:349:void lambda$get$0(com.android.tools.r8.graph.DexClass):285:285 -> a
-    350:350:void lambda$get$0(com.android.tools.r8.graph.DexClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":643,"2":644,"3":645}}
-    643:643:void lambda$get$0(com.android.tools.r8.graph.DexClass):286:286 -> a
-    644:644:void lambda$get$0(com.android.tools.r8.graph.DexClass):286:286 -> a
-    645:645:void lambda$get$0(com.android.tools.r8.graph.DexClass):286:286 -> a
-    636:637:void lambda$get$0(com.android.tools.r8.graph.DexClass):286:287 -> a
-    638:638:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    638:638:void lambda$get$0(com.android.tools.r8.graph.DexClass):287 -> a
-    639:639:void lambda$get$0(com.android.tools.r8.graph.DexClass):287:287 -> a
-    1:1:java.lang.Object get():255:255 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.Ja:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":622,"2":623,"3":624}}
+    622:622:void lambda$get$0(com.android.tools.r8.graph.DexClass):276:276 -> a
+    623:623:void lambda$get$0(com.android.tools.r8.graph.DexClass):276:276 -> a
+    624:624:void lambda$get$0(com.android.tools.r8.graph.DexClass):276:276 -> a
+    340:340:void lambda$get$0(com.android.tools.r8.graph.DexClass):276:276 -> a
+    341:341:void lambda$get$0(com.android.tools.r8.graph.DexClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":625,"2":626,"3":627}}
+    625:625:void lambda$get$0(com.android.tools.r8.graph.DexClass):277:277 -> a
+    626:626:void lambda$get$0(com.android.tools.r8.graph.DexClass):277:277 -> a
+    627:627:void lambda$get$0(com.android.tools.r8.graph.DexClass):277:277 -> a
+    618:619:void lambda$get$0(com.android.tools.r8.graph.DexClass):277:278 -> a
+    620:620:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    620:620:void lambda$get$0(com.android.tools.r8.graph.DexClass):278 -> a
+    621:621: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.Ia:
     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
@@ -121691,7 +121273,7 @@
     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$ClassFileResourceReader -> com.android.tools.r8.internal.Fa:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.Ea:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -121716,14 +121298,14 @@
     126:126:java.lang.String toString():123:123 -> toString
     127:127:java.lang.String toString():123:123 -> toString
     124:124:java.lang.String toString():123:123 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.Ga:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.Fa:
     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.Ha:
+com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.Ga:
     java.util.Set filteredOut -> c
     com.android.tools.r8.utils.ClassProvider provider -> b
     boolean $assertionsDisabled -> d
@@ -121741,7 +121323,7 @@
     6:9:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):175:178 -> a
     10:11: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.Ia:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.Ha:
     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>
@@ -121753,7 +121335,7 @@
     152:152:java.lang.String toString():149:149 -> toString
     153:153:java.lang.String toString():149:149 -> toString
     150:150:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.Ma:
+com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.La:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -121767,7 +121349,7 @@
     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.jb:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.ib:
     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
@@ -121792,17 +121374,17 @@
     7:7:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12 -> a
     8:8:com.android.tools.r8.graph.DexClasspathClass com.android.tools.r8.utils.ClasspathClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexClasspathClass):28:28 -> a
     8:8:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12 -> a
-    1:1:com.android.tools.r8.graph.ClassKind getClassKind():38:38 -> e
-    1:1:com.android.tools.r8.utils.ClasspathClassCollection empty():23:23 -> g
-    2:2:void com.android.tools.r8.utils.ClasspathClassCollection.<init>():15:15 -> g
-    2:2:com.android.tools.r8.utils.ClasspathClassCollection empty():23 -> g
+    1:1:com.android.tools.r8.graph.ClassKind getClassKind():38:38 -> c
+    1:1:com.android.tools.r8.utils.ClasspathClassCollection empty():23:23 -> e
+    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():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":45,"2":46,"3":47}}
     45:45:java.lang.String toString():43:43 -> toString
     46:46:java.lang.String toString():43:43 -> toString
     47:47:java.lang.String toString():43:43 -> toString
     44:44:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.ac:
+com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.Zb:
     1:1:java.util.Set mergeSets(java.util.Collection,java.util.Collection):22:22 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder.addAll(java.lang.Iterable):448:448 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.addAll(java.lang.Iterable):535 -> a
@@ -121820,21 +121402,21 @@
     5:5:java.util.Set mergeSets(java.util.Collection,java.util.Collection):24 -> a
     6:6:java.util.Set mergeSets(java.util.Collection,java.util.Collection):25:25 -> a
     7:8:java.util.Collection sort(java.util.Collection,java.util.Comparator):36:37 -> a
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.kc:
+com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.jc:
     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.lc:
+com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.kc:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.fromComparisonResult(int) -> a
     boolean com.android.tools.r8.utils.CompareResult.isEqual() -> b
     int getComparisonResult(int) -> c
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.Rd:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.Qd:
     void lambda$emptyBiConsumer$5(java.lang.Object,java.lang.Object) -> a
     void lambda$emptyConsumer$4(java.lang.Object) -> a
     1:1:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):30:30 -> a
@@ -121845,7 +121427,7 @@
     void lambda$emptyThrowingConsumer$6(java.lang.Object) -> b
     1:1:java.util.function.Consumer emptyConsumer():43:43 -> b
     1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():51:51 -> c
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase -> com.android.tools.r8.internal.if:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase -> com.android.tools.r8.internal.df:
     java.util.ArrayDeque workList -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():21:21 -> <clinit>
@@ -121861,9 +121443,9 @@
     19:19:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList.createDfsNode(java.lang.Object):183 -> a
     19:19:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl internalEnqueueNode(java.lang.Object):116 -> a
     20:21:com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl internalEnqueueNode(java.lang.Object):117:118 -> a
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode -> com.android.tools.r8.internal.df:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode -> com.android.tools.r8.internal.Ye:
     java.lang.Object getNode() -> a
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl -> com.android.tools.r8.internal.ef:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl -> com.android.tools.r8.internal.Ze:
     com.android.tools.r8.utils.DepthFirstSearchWorkListBase$ProcessingState processingState -> b
     java.lang.Object node -> a
     boolean $assertionsDisabled -> c
@@ -121877,18 +121459,18 @@
     1:1:boolean seenAndNotProcessed():77:77 -> f
     1:2:void setFinished():66:67 -> g
     1:1:void setWaiting():62:62 -> h
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState -> com.android.tools.r8.internal.ff:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState -> com.android.tools.r8.internal.af:
     void setState(java.lang.Object) -> a
     java.lang.Object getState() -> b
     boolean hasState() -> c
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl -> com.android.tools.r8.internal.gf:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl -> com.android.tools.r8.internal.bf:
     java.lang.Object state -> d
     1:1:void <init>(java.lang.Object,com.android.tools.r8.utils.DepthFirstSearchWorkListBase$1):81:81 -> <init>
     2:2:void <init>(java.lang.Object):86:86 -> <init>
     1:1:void setState(java.lang.Object):96:96 -> a
     1:1:java.lang.Object getState():91:91 -> b
     1:1:boolean hasState():101:101 -> c
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList -> com.android.tools.r8.internal.cf:
     java.util.Map childStateMap -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():183:183 -> <clinit>
@@ -121899,9 +121481,9 @@
     3:6:com.android.tools.r8.utils.TraversalContinuation internalOnJoin(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):232:232 -> a
     1:4:com.android.tools.r8.utils.TraversalContinuation internalOnVisit(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):218:221 -> b
     1:3:java.util.List lambda$internalOnJoin$1(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):237:237 -> c
-com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.lf:
+com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.gf:
     1:2:java.util.Deque newArrayDeque(java.lang.Object):13:14 -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.of:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.jf:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -121981,23 +121563,23 @@
     71:71:java.lang.String[] getArgumentTypeDescriptors(java.lang.String):678:678 -> e
     1:1:java.lang.String getBinaryNameFromDescriptor(java.lang.String):398:398 -> f
     2:2:java.lang.String getBinaryNameFromDescriptor(java.lang.String):0:0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":401,"3":402}}
-    401:401:java.lang.String getBinaryNameFromDescriptor(java.lang.String):399:399 -> f
-    402:402:java.lang.String getBinaryNameFromDescriptor(java.lang.String):399:399 -> f
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"3":5}}
+    3:3:java.lang.String getBinaryNameFromDescriptor(java.lang.String):399:399 -> f
+    5:5:java.lang.String getBinaryNameFromDescriptor(java.lang.String):399:399 -> f
     1:1:java.lang.String getBinaryNameFromJavaType(java.lang.String):390:390 -> g
     1:1:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
     2:2:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):0:0 -> h
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":739,"2":740,"3":741,"4":742,"5":743}}
-    739:739:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
-    740:740:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
-    741:741:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
-    742:742:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
-    743:743:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":372,"2":373,"3":374,"4":375,"5":376}}
+    372:372:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
+    373:373:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
+    374:374:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
+    375:375:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
+    376:376:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
     370:370:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):368:368 -> h
     371:371:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):0:0 -> h
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":745,"3":746}}
-    745:745:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):370:370 -> h
-    746:746:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):370:370 -> h
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":372,"3":374}}
+    372:372:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):370:370 -> h
+    374:374:java.lang.String getClassBinaryNameFromDescriptor(java.lang.String):370:370 -> h
     1:2:java.lang.String getClassFileName(java.lang.String):643:644 -> i
     1:2:java.lang.String getClassNameFromDescriptor(java.lang.String):290:291 -> j
     1:2:java.lang.String getDescriptorFromClassBinaryName(java.lang.String):409:410 -> k
@@ -122012,43 +121594,43 @@
     1:1:int com.android.tools.r8.utils.DescriptorUtils.getSimpleClassNameIndex(java.lang.String):327:327 -> r
     1:1:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):302 -> r
     2:2:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):0:0 -> r
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":304,"3":305}}
-    304:304:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):302:302 -> r
-    305:305:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):301:301 -> r
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"3":5}}
+    3:3:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):302:302 -> r
+    5:5:java.lang.String getSimpleClassNameFromDescriptor(java.lang.String):301:301 -> r
     1:1:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):280:280 -> s
     2:3:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getUnqualifiedClassNameFromBinaryName(java.lang.String):436:437 -> s
     2:3:java.lang.String getUnqualifiedClassNameFromDescriptor(java.lang.String):280 -> s
     1:8:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):611:618 -> t
     9:9:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):0:0 -> t
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":637,"3":638}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":637,"3":639}}
     637:637:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):619:619 -> t
-    638:638:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):619:619 -> t
+    639:639:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):619:619 -> t
     629:632:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):620:623 -> t
     633:633:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
     634:634:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):0:0 -> t
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":640,"2":641,"3":642,"4":643,"5":644}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":637,"2":638,"3":639,"4":640,"5":641}}
+    637:637:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
+    638:638:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
+    639:639:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
     640:640:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
     641:641:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
-    642:642:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
-    643:643:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
-    644:644:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
     635:635:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> t
     635:635:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621 -> t
     636:636:com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor guessJrtModuleAndTypeDescriptor(java.lang.String):621:621 -> t
     1:2:java.lang.String guessTypeDescriptor(java.lang.String):550:551 -> u
     3:3:java.lang.String guessTypeDescriptor(java.lang.String):0:0 -> u
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":565,"3":566}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":565,"3":567}}
     565:565:java.lang.String guessTypeDescriptor(java.lang.String):553:553 -> u
-    566:566:java.lang.String guessTypeDescriptor(java.lang.String):553:553 -> u
+    567:567:java.lang.String guessTypeDescriptor(java.lang.String):553:553 -> u
     557:560:java.lang.String guessTypeDescriptor(java.lang.String):554:557 -> u
     561:561:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
     562:562:java.lang.String guessTypeDescriptor(java.lang.String):0:0 -> u
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":568,"2":569,"3":570,"4":571,"5":572}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":565,"2":566,"3":567,"4":568,"5":569}}
+    565:565:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
+    566:566:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
+    567:567:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
     568:568:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
     569:569:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
-    570:570:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
-    571:571:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
-    572:572:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
     563:563:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> u
     563:563:java.lang.String guessTypeDescriptor(java.lang.String):555 -> u
     564:564:java.lang.String guessTypeDescriptor(java.lang.String):555:555 -> u
@@ -122061,13 +121643,13 @@
     1:6:boolean isValidJavaType(java.lang.String):123:128 -> x
     1:2:java.lang.String javaTypeToDescriptor(java.lang.String):67:68 -> y
     1:2:java.lang.String javaTypeToDescriptorIgnorePrimitives(java.lang.String):82:83 -> z
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.nf:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.if:
     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.gh:
+com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.bh:
     1:1:java.lang.String getDefaultDexFileName(int):10:10 -> a
     2:2:java.lang.String getDefaultDexFileName(int):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":14,"2":15,"3":16}}
@@ -122075,7 +121657,7 @@
     15:15:java.lang.String getDefaultDexFileName(int):11:11 -> a
     16:16:java.lang.String getDefaultDexFileName(int):11:11 -> a
     13:13:java.lang.String getDefaultDexFileName(int):11:11 -> a
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.ih:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.dh:
     com.android.tools.r8.utils.DexVersion[] $VALUES -> h
     int dexVersion -> b
     com.android.tools.r8.utils.DexVersion V35 -> d
@@ -122102,10 +121684,10 @@
     1:1:int getIntValue():28:28 -> b
     2:2:boolean matchesApiLevel(com.android.tools.r8.utils.AndroidApiLevel):36:36 -> b
     1:1:com.android.tools.r8.utils.DexVersion[] values():12:12 -> c
-com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.hh:
+com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.ch:
     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.mh:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.hh:
     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>
@@ -122121,7 +121703,7 @@
     72:72:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):52:52 -> a
     77:82:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):61:66 -> a
     83:83:java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.ph:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.kh:
     java.util.Map parent -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -122137,33 +121719,33 @@
     1:3:java.lang.Object makeSet(java.lang.Object):27:29 -> e
     1:1:java.lang.String toString():150:150 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":164,"2":165,"3":167}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":164,"2":165,"3":166}}
     164:164:java.lang.String toString():151:151 -> toString
     165:165:java.lang.String toString():151:151 -> toString
-    167:167:java.lang.String toString():153:153 -> toString
+    166:166:java.lang.String toString():153:153 -> toString
     156:163:java.lang.String toString():154:161 -> toString
-com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.Ah:
+com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.vh:
     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.xh:
+com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.sh:
     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.yh:
+com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.th:
     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.zh:
+com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.uh:
     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.ei:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.Zh:
     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
@@ -122197,7 +121779,7 @@
     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.fj:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.aj:
     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
@@ -122253,9 +121835,9 @@
     3:9:com.android.tools.r8.origin.Origin com.android.tools.r8.utils.ExceptionUtils.extractIOExceptionOrigin(java.io.IOException):211:217 -> c
     3:9:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):150 -> c
     10:22:com.android.tools.r8.origin.Origin getOrigin(java.lang.Throwable):152:164 -> c
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.fj$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.gj:
-com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.hj:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.aj$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.bj:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.cj:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):263:265 -> <init>
@@ -122323,32 +121905,32 @@
     1:1:void <clinit>():271:271 -> <clinit>
     1:5:void <init>(java.lang.String,java.lang.String):278:282 -> <init>
     6:6:void <init>(java.lang.String,java.lang.String):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1174,"3":1175}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1174,"3":1176}}
     1174:1174:void <init>(java.lang.String,java.lang.String):284:284 -> <init>
-    1175:1175:void <init>(java.lang.String,java.lang.String):284:284 -> <init>
+    1176:1176:void <init>(java.lang.String,java.lang.String):284:284 -> <init>
     291:291:void <init>(java.lang.String,java.lang.String):285:285 -> <init>
     292:292:void <init>(java.lang.String,java.lang.String):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1180,"3":1181}}
-    1180:1180:void <init>(java.lang.String,java.lang.String):289:289 -> <init>
-    1181:1181:void <init>(java.lang.String,java.lang.String):289:289 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1174,"3":1176}}
+    1174:1174:void <init>(java.lang.String,java.lang.String):289:289 -> <init>
+    1176:1176:void <init>(java.lang.String,java.lang.String):289:289 -> <init>
     581:581:void <init>(java.lang.String,java.lang.String):289:289 -> <init>
     582:582:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
     583:583:void <init>(java.lang.String,java.lang.String):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1182,"2":1183,"3":1184,"4":1185,"5":1186}}
-    1182:1182:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
-    1183:1183:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
-    1184:1184:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
-    1185:1185:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
-    1186:1186:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1174,"2":1175,"3":1176,"4":1177,"5":1178}}
+    1174:1174:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
+    1175:1175:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
+    1176:1176:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
+    1177:1177:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
+    1178:1178:void <init>(java.lang.String,java.lang.String):286:286 -> <init>
     869:879:void <init>(java.lang.String,java.lang.String):286:296 -> <init>
     880:880:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
     881:881:void <init>(java.lang.String,java.lang.String):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1192,"2":1193,"3":1194,"4":1195,"5":1196}}
-    1192:1192:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
-    1193:1193:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
-    1194:1194:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
-    1195:1195:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
-    1196:1196:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1174,"2":1175,"3":1176,"4":1177,"5":1178}}
+    1174:1174:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
+    1175:1175:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
+    1176:1176:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
+    1177:1177:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
+    1178:1178:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
     1173:1173:void <init>(java.lang.String,java.lang.String):292:292 -> <init>
 com.android.tools.r8.utils.FeatureClassMapping$Internal -> com.android.tools.r8.utils.v:
     boolean $assertionsDisabled -> a
@@ -122361,30 +121943,30 @@
 com.android.tools.r8.utils.FeatureClassMapping$JarFileOrigin -> com.android.tools.r8.utils.w:
     1:1:void <init>(java.nio.file.Path):84:84 -> <init>
     1:1:java.lang.String part():0:0 -> part
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":180,"2":181,"3":182}}
-    180:180:java.lang.String part():89:89 -> part
-    181:181:java.lang.String part():89:89 -> part
-    182:182:java.lang.String part():89:89 -> part
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":92,"2":93,"3":94}}
+    92:92:java.lang.String part():89:89 -> part
+    93:93:java.lang.String part():89:89 -> part
+    94:94:java.lang.String part():89:89 -> part
     90:90:java.lang.String part():89:89 -> part
     91:91:java.lang.String part():0:0 -> part
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":183,"2":184,"3":185}}
-    183:183:java.lang.String part():89:89 -> part
-    184:184:java.lang.String part():89:89 -> part
-    185:185:java.lang.String part():89:89 -> part
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":92,"2":93,"3":94}}
+    92:92:java.lang.String part():89:89 -> part
+    93:93:java.lang.String part():89:89 -> part
+    94:94:java.lang.String part():89:89 -> part
 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():0:0 -> part
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":156,"2":157,"3":158}}
-    156:156:java.lang.String part():77:77 -> part
-    157:157:java.lang.String part():77:77 -> part
-    158:158:java.lang.String part():77:77 -> part
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82}}
+    80:80:java.lang.String part():77:77 -> part
+    81:81:java.lang.String part():77:77 -> part
+    82:82:java.lang.String part():77:77 -> part
     78:78:java.lang.String part():77:77 -> part
     79:79:java.lang.String part():0:0 -> part
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":159,"2":160,"3":161}}
-    159:159:java.lang.String part():77:77 -> part
-    160:160:java.lang.String part():77:77 -> part
-    161:161:java.lang.String part():77:77 -> part
-com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.bk:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82}}
+    80:80:java.lang.String part():77:77 -> part
+    81:81:java.lang.String part():77:77 -> part
+    82:82:java.lang.String part():77:77 -> part
+com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.Wj:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -122407,7 +121989,7 @@
     8:8:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
     8:8:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):29 -> b
     9:9: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.ek:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Zj:
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -122418,7 +122000,7 @@
     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.lk:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.gk:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:16:void <clinit>():21:36 -> <clinit>
@@ -122438,9 +122020,9 @@
     1:6:boolean isClassFile(java.nio.file.Path):49:54 -> b
     1:2:boolean isClassesDexFile(java.nio.file.Path):141:142 -> c
     3:3:boolean isClassesDexFile(java.nio.file.Path):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"3":162}}
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"3":163}}
     161:161:boolean isClassesDexFile(java.nio.file.Path):145:145 -> c
-    162:162:boolean isClassesDexFile(java.nio.file.Path):145:145 -> c
+    163:163:boolean isClassesDexFile(java.nio.file.Path):145:145 -> c
     149:160:boolean isClassesDexFile(java.nio.file.Path):146:157 -> c
     1:2:boolean isDexFile(java.nio.file.Path):39:40 -> d
     1:2:boolean isJarFile(java.nio.file.Path):58:59 -> e
@@ -122448,9 +122030,9 @@
     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.Ck:
+com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.xk:
     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.Bk:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.wk:
     java.nio.file.Path path -> f
     1:2:void <init>(java.nio.file.Path):23:24 -> <init>
     1:1:java.lang.String part():0:0 -> part
@@ -122459,19 +122041,19 @@
     32:32:java.lang.String part():29:29 -> part
     33:33:java.lang.String part():29:29 -> part
     30:30:java.lang.String part():29:29 -> part
-com.android.tools.r8.utils.ForEachUtils -> com.android.tools.r8.internal.Ok:
+com.android.tools.r8.utils.ForEachUtils -> com.android.tools.r8.internal.Jk:
     1:6:boolean allMatch(java.util.function.Consumer,java.util.function.Predicate):13:18 -> a
     7:7:void lambda$allMatch$0(com.android.tools.r8.utils.BooleanBox,java.util.function.Predicate,java.lang.Object):16:16 -> a
-com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.Pk:
-com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.Qk:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.Kk:
+com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.Lk:
     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.Dl:
+com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.yl:
     1:1:java.lang.Object applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):15:15 -> a
     2:3:void forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):28:29 -> a
     4:4:java.util.function.Function ignoreArgument(java.util.function.Supplier):34:34 -> a
     5:5: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.Om:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.Jm:
     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
@@ -122481,28 +122063,28 @@
     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.An:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.wn:
     java.lang.Iterable order(java.lang.Iterable) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.yn:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.un:
     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.zn:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.vn:
     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.Ln:
+com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.Hn:
     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:1:boolean isRelaxedDexIdentifierPart(int):18:18 -> c
     boolean isSimpleNameChar(int) -> d
-com.android.tools.r8.utils.Int2StructuralItemArrayMap -> com.android.tools.r8.internal.Us:
+com.android.tools.r8.utils.Int2StructuralItemArrayMap -> com.android.tools.r8.internal.Ns:
     int[] keys -> b
     java.util.List values -> c
     boolean $assertionsDisabled -> d
@@ -122519,7 +122101,7 @@
     1:2:boolean equals(java.lang.Object):63:64 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():37:37 -> n
-com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder -> com.android.tools.r8.internal.Ts:
+com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder -> com.android.tools.r8.internal.Ms:
     java.util.List keys -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder values -> b
     1:1:void <init>(com.android.tools.r8.utils.Int2StructuralItemArrayMap$1):80:80 -> <init>
@@ -122536,7 +122118,7 @@
     11:11:com.android.tools.r8.utils.Int2StructuralItemArrayMap build():98 -> a
     12:12:com.android.tools.r8.utils.Int2StructuralItemArrayMap build():98:98 -> a
     1:1:boolean isEmpty():94:94 -> b
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.bt:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.Us:
     boolean $assertionsDisabled -> b
     int value -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -122550,11 +122132,11 @@
     1:1:void increment():48:48 -> c
     2:3:void increment(int):52:53 -> c
     1:1:void set(int):57:57 -> d
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.st:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.lt:
     void accept(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.tt:
+com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.mt:
     boolean test(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.ut:
+com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.nt:
     java.lang.Object apply(int,java.lang.Object) -> a
 com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.z:
     java.util.zip.ZipFile openedZipFile -> e
@@ -122588,548 +122170,546 @@
     122:122:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> getProgramResource
     122:122:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     123:123:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
-com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.cu:
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> i1
-    boolean enableStringSwitchConversion -> P
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.Vt:
+    boolean hasMarker -> f0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> i1
     boolean printTimes -> i
-    boolean invalidDebugInfoStrict -> b0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> R0
-    java.util.Map warningInvalidDebugInfo -> Y0
+    boolean ignoreJavaLibraryOverride -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
     com.android.tools.r8.experimental.startup.StartupConfiguration startupConfiguration -> g
-    boolean enableRedundantConstNumberOptimization -> X
     boolean enableFieldBitAccessAnalysis -> q
-    boolean skipReadingDexCode -> Z0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> d1
-    int SUPPORTED_DEX_VERSION -> u1
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> N0
+    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> P0
+    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> L0
+    com.android.tools.r8.StringConsumer configurationConsumer -> d1
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> t0
     boolean enableInitializedClassesAnalysis -> y
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> h1
-    java.util.Set extensiveLoggingFilter -> i0
-    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> J0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> i0
+    com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> q1
     java.util.List outputInspections -> h
-    java.util.function.Consumer syntheticProguardRulesConsumer -> l1
-    boolean forceProguardCompatibility -> E0
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> N0
+    com.android.tools.r8.DumpOptions dumpOptions -> e0
+    boolean relocatorCompilation -> f1
+    int callGraphLikelySpuriousCallEdgeThreshold -> L
     boolean forceAnnotateSynthetics -> I
     boolean printMemory -> j
-    boolean enableMinification -> A0
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> s0
-    java.util.List mainDexKeepRules -> S0
+    boolean ignoreMissingClasses -> A0
+    com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> J0
+    boolean enableEnumValueOptimization -> Q
     boolean enableVerticalClassMerging -> r
-    boolean enableTreeShaking -> z0
-    java.util.List methodsFilter -> k0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> k1
+    boolean enableMinification -> z0
+    boolean processCovariantReturnTypeAnnotations -> v0
+    boolean useSmaliSyntax -> Y
     boolean enableSideEffectAnalysis -> z
-    boolean enableLoadStoreOptimization -> r0
     boolean cfToCfDesugar -> H
-    boolean retainCompileTimeAnnotations -> n0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> j1
-    int callGraphLikelySpuriousCallEdgeThreshold -> M
-    boolean hasMarker -> g0
+    boolean ignoreBootClasspathEnumsForMaindexTracing -> n0
+    boolean enableSwitchRewriting -> N
     java.lang.String dumpInputToDirectory -> l
-    boolean ignoreJavaLibraryOverride -> c0
-    boolean enableRedundantFieldLoadElimination -> V
-    java.util.Map warningInvalidParameterAnnotations -> X0
+    boolean ignoreMainDexMissingClasses -> c0
+    boolean enableUninstantiatedTypeOptimizationForInterfaces -> V
+    java.util.Map warningInvalidDebugInfo -> X0
     boolean enableClassInlining -> w
-    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> M0
-    com.android.tools.r8.dex.Marker marker -> h0
-    java.util.Set invalidLibraryClasses -> q1
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> F0
-    com.android.tools.r8.cf.CfVersion EXPERIMENTAL_CF_VERSION -> t1
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> a1
-    com.android.tools.r8.SourceFileProvider sourceFileProvider -> n1
-    com.android.tools.r8.StringConsumer configurationConsumer -> e1
-    com.android.tools.r8.MapIdProvider mapIdProvider -> m1
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> S
+    int SUPPORTED_DEX_VERSION -> t1
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> a1
+    java.util.Set extensiveLoggingFilter -> h0
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> I0
+    boolean minimalMainDex -> S0
     boolean enableTreeShakingOfLibraryMethodOverrides -> E
-    com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> r1
+    java.util.function.Consumer syntheticProguardRulesConsumer -> k1
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    com.android.tools.r8.DumpOptions dumpOptions -> f0
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> O0
-    boolean enableSwitchRewriting -> O
-    boolean relocatorCompilation -> g1
+    boolean enableStringSwitchConversion -> O
+    boolean configurationDebugging -> F0
     boolean libraryInterfacesMayHaveStaticInitialization -> p
     java.lang.String dumpInputToFile -> k
-    boolean ignoreMissingClasses -> B0
-    boolean enableUninstantiatedTypeOptimizationForInterfaces -> W
-    com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> K0
+    boolean reportMissingClassesInEnclosingMethodAttribute -> B0
+    boolean enableRedundantConstNumberOptimization -> W
     boolean enableClassStaticizer -> x
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> V0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    boolean processCovariantReturnTypeAnnotations -> w0
+    java.util.List logArgumentsFilter -> p0
+    boolean lookupLibraryBeforeProgram -> w0
+    java.util.concurrent.atomic.AtomicBoolean reportedErrorReadingKotlinMetadataReflectively -> o1
+    boolean enableNestReduction -> s0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> j1
     java.util.function.BiPredicate dexClassChecksumFilter -> G
     boolean encodeChecksums -> F
-    boolean ignoreBootClasspathEnumsForMaindexTracing -> o0
-    com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> L0
+    boolean pruneNonVissibleAnnotationClasses -> o0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean passthroughDexCode -> m
-    boolean ignoreMainDexMissingClasses -> d0
-    boolean enableVisibilityBridgeRemoval -> L
+    boolean enableCfByteCodePassThrough -> d0
     boolean enableEnumUnboxing -> u
-    java.util.Map missingEnclosingMembers -> W0
+    java.util.Set invalidLibraryClasses -> p1
+    com.android.tools.r8.dex.Marker marker -> g0
+    java.util.Map warningInvalidParameterAnnotations -> W0
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean minimalMainDex -> T0
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> b1
-    com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> s1
-    com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> P0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> T
+    boolean enableInheritanceClassInDexDistributor -> T0
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> E0
+    boolean $assertionsDisabled -> u1
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> b1
+    com.android.tools.r8.cf.CfVersion EXPERIMENTAL_CF_VERSION -> s1
+    com.android.tools.r8.SourceFileProvider sourceFileProvider -> m1
+    int threadCount -> X
+    com.android.tools.r8.MapIdProvider mapIdProvider -> l1
     java.util.Set neverMergePrefixes -> o
-    java.lang.Thread mainThread -> N
-    boolean skipIR -> H0
+    boolean debug -> H0
     boolean enableNameReflectionOptimization -> C
+    int minimumStringSwitchSize -> P
     boolean enableNeverMergePrefixes -> n
-    boolean configurationDebugging -> G0
-    boolean reportMissingClassesInEnclosingMethodAttribute -> C0
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> U
+    boolean skipIR -> G0
+    boolean reportMissingClassesInInnerClassAttributes -> C0
+    boolean enableRedundantFieldLoadElimination -> U
     boolean enableSimpleInliningConstraints -> v
-    java.util.concurrent.atomic.AtomicBoolean reportedErrorReadingKotlinMetadataReflectively -> p1
-    boolean lookupLibraryBeforeProgram -> x0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> v0
-    com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> l0
-    java.util.List logArgumentsFilter -> q0
-    boolean enableNestReduction -> t0
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> T
-    boolean pruneNonVissibleAnnotationClasses -> p0
-    int threadCount -> Y
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> U0
+    boolean enableMainDexListCheck -> x0
+    com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification machineDesugaredLibrarySpecification -> e1
+    boolean intermediate -> l0
+    com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> K0
     boolean enableStringConcatenationOptimization -> D
-    int minimumStringSwitchSize -> Q
-    boolean enableCfByteCodePassThrough -> e0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> h1
     boolean readDebugSetFileEvent -> J
-    boolean invalidDebugInfoFatal -> a0
-    boolean enableEnumValueOptimization -> R
-    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> Q0
-    java.util.Set reportedMissingForDesugaring -> o1
+    boolean invalidDebugInfoStrict -> a0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> Q0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> Z0
+    boolean enableEnumSwitchMapRemoval -> R
+    boolean skipReadingDexCode -> Y0
     boolean enableUnusedInterfaceRemoval -> s
-    boolean $assertionsDisabled -> v1
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> j0
-    boolean enableInheritanceClassInDexDistributor -> U0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> c1
-    boolean useSmaliSyntax -> Z
+    java.util.Map missingEnclosingMembers -> V0
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> M0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> c1
+    com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> r1
+    com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> O0
+    boolean invalidDebugInfoFatal -> Z
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> g1
     boolean enableDeterminismAnalysis -> A
-    boolean debug -> I0
-    boolean reportMissingClassesInInnerClassAttributes -> D0
+    boolean forceProguardCompatibility -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> r0
     boolean disableL8AnnotationRemoval -> K
-    boolean enableMainDexListCheck -> y0
-    boolean enableEnumSwitchMapRemoval -> S
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> u0
+    boolean enableTreeShaking -> y0
+    java.util.List mainDexKeepRules -> R0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> u0
     boolean enableDevirtualization -> t
-    com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification machineDesugaredLibrarySpecification -> f1
-    boolean intermediate -> m0
+    com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> k0
+    java.util.Set reportedMissingForDesugaring -> n1
+    boolean enableLoadStoreOptimization -> q0
+    java.util.List methodsFilter -> j0
+    java.lang.Thread mainThread -> M
+    boolean retainCompileTimeAnnotations -> m0
     boolean enableServiceLoaderRewriting -> B
     1:32:void <clinit>():109:140 -> <clinit>
     1:1:void <init>():171:171 -> <init>
-    2:961:void <init>():162:1121 -> <init>
-    962:966:void <init>():172:176 -> <init>
-    967:967:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):180:180 -> <init>
-    968:1927:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):162:1121 -> <init>
-    1928:1935:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):181:188 -> <init>
-    1936:1936:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):193:193 -> <init>
-    1937:2896:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):162:1121 -> <init>
-    2897:2917:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):194:214 -> <init>
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> A
-    1:1:boolean canHaveThisJitCodeDebuggingBug():2028 -> A
-    2:2:boolean canHaveThisJitCodeDebuggingBug():2028:2028 -> A
-    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():658:658 -> A0
-    1:1:boolean canHaveThisTypeVerifierBug():2019:2019 -> B
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> B
-    2:2:boolean canHaveThisTypeVerifierBug():2019 -> B
-    3:3:boolean canHaveThisTypeVerifierBug():2019:2019 -> B
-    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():663:663 -> B0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> C
-    1:1:boolean canHaveTracingPastInstructionsStreamBug():2190 -> C
-    2:2:boolean canHaveTracingPastInstructionsStreamBug():2190:2190 -> C
-    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():668:668 -> C0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> D
-    1:1:boolean canHaveZipFileWithMissingCloseableBug():2315 -> D
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> D
-    2:2:boolean canHaveZipFileWithMissingCloseableBug():2315 -> D
-    3:3:boolean canHaveZipFileWithMissingCloseableBug():2315:2315 -> D
-    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():673:673 -> D0
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1964:1964 -> E
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> E
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> E
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1964 -> E
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> E
-    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():1964 -> E
-    1:3:boolean isMinifying():602:602 -> E0
-    5:5:boolean isMinifying():604:604 -> E0
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1862:1862 -> F
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> F
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> F
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1862 -> F
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> F
-    3:3:boolean canLeaveStaticInterfaceMethodInvokes():1862 -> F
-    1:1:boolean isOptimizing():588:588 -> F0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> G
-    1:1:boolean canParseNumbersWithPlusPrefix():2331 -> G
-    2:2:boolean canParseNumbersWithPlusPrefix():2331:2331 -> G
-    1:1:boolean isRelease():592:592 -> G0
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1945:1945 -> H
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> H
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> H
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1945 -> H
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> H
-    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():1945 -> H
-    1:1:boolean isRepackagingEnabled():629:629 -> H0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1267:1267 -> H0
-    2:2:boolean isRepackagingEnabled():629 -> H0
+    2:949:void <init>():162:1109 -> <init>
+    950:954:void <init>():172:176 -> <init>
+    955:955:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):180:180 -> <init>
+    956:1903:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):162:1109 -> <init>
+    1904:1911:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):181:188 -> <init>
+    1912:1912:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):193:193 -> <init>
+    1913:2860:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):162:1109 -> <init>
+    2861:2881:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):194:214 -> <init>
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> A
+    1:1:boolean canHaveThisJitCodeDebuggingBug():2016 -> A
+    2:2:boolean canHaveThisJitCodeDebuggingBug():2016:2016 -> A
+    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():657:657 -> A0
+    1:1:boolean canHaveThisTypeVerifierBug():2007:2007 -> B
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> B
+    2:2:boolean canHaveThisTypeVerifierBug():2007 -> B
+    3:3:boolean canHaveThisTypeVerifierBug():2007:2007 -> B
+    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():662:662 -> B0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> C
+    1:1:boolean canHaveTracingPastInstructionsStreamBug():2178 -> C
+    2:2:boolean canHaveTracingPastInstructionsStreamBug():2178:2178 -> C
+    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():667:667 -> C0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> D
+    1:1:boolean canHaveZipFileWithMissingCloseableBug():2303 -> D
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> D
+    2:2:boolean canHaveZipFileWithMissingCloseableBug():2303 -> D
+    3:3:boolean canHaveZipFileWithMissingCloseableBug():2303:2303 -> D
+    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():672:672 -> D0
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1952:1952 -> E
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> E
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> E
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1952 -> E
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> E
+    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():1952 -> E
+    1:3:boolean isMinifying():601:601 -> E0
+    5:5:boolean isMinifying():603:603 -> E0
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1850:1850 -> F
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> F
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> F
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1850 -> F
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> F
+    3:3:boolean canLeaveStaticInterfaceMethodInvokes():1850 -> F
+    1:1:boolean isOptimizing():587:587 -> F0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> G
+    1:1:boolean canParseNumbersWithPlusPrefix():2319 -> G
+    2:2:boolean canParseNumbersWithPlusPrefix():2319:2319 -> G
+    1:1:boolean isRelease():591:591 -> G0
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1933:1933 -> H
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> H
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> H
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1933 -> H
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> H
+    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():1933 -> H
+    1:1:boolean isRepackagingEnabled():628:628 -> H0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1255:1255 -> H0
+    2:2:boolean isRepackagingEnabled():628 -> H0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1251:1251 -> H0
-    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1267 -> H0
-    3:3:boolean isRepackagingEnabled():629 -> H0
+    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1239:1239 -> H0
+    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1255 -> H0
+    3:3:boolean isRepackagingEnabled():628 -> H0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4:4:boolean isRepackagingEnabled():629:629 -> H0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> I
-    1:1:boolean canUseConstantMethodHandle():1838 -> I
-    2:2:boolean canUseConstantMethodHandle():1838:1838 -> I
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> I
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> I
-    3:3:boolean canUseConstantMethodHandle():1838 -> I
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> I
-    4:4:boolean canUseConstantMethodHandle():1838 -> I
-    1:3:boolean isShrinking():596:596 -> I0
-    5:5:boolean isShrinking():598:598 -> I0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> J
-    1:1:boolean canUseConstantMethodType():1842 -> J
-    2:2:boolean canUseConstantMethodType():1842:1842 -> J
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> J
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> J
-    3:3:boolean canUseConstantMethodType():1842 -> J
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> J
-    4:4:boolean canUseConstantMethodType():1842 -> J
-    1:1:boolean isStringSwitchConversionEnabled():1923:1923 -> J0
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1850:1850 -> K
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> K
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> K
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1850 -> K
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> K
-    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1850 -> K
+    4:4:boolean isRepackagingEnabled():628:628 -> H0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> I
+    1:1:boolean canUseConstantMethodHandle():1826 -> I
+    2:2:boolean canUseConstantMethodHandle():1826:1826 -> I
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> I
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> I
+    3:3:boolean canUseConstantMethodHandle():1826 -> I
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> I
+    4:4:boolean canUseConstantMethodHandle():1826 -> I
+    1:3:boolean isShrinking():595:595 -> I0
+    5:5:boolean isShrinking():597:597 -> I0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> J
+    1:1:boolean canUseConstantMethodType():1830 -> J
+    2:2:boolean canUseConstantMethodType():1830:1830 -> J
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> J
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> J
+    3:3:boolean canUseConstantMethodType():1830 -> J
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> J
+    4:4:boolean canUseConstantMethodType():1830 -> J
+    1:1:boolean isStringSwitchConversionEnabled():1911:1911 -> J0
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1838:1838 -> K
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> K
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> K
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1838 -> K
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> K
+    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1838 -> K
     1:6:void keepDebugRelatedInformation():219:224 -> K0
-    1:2:boolean canUseFilledNewArrayOfObjects():1976:1977 -> L
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> L
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> L
-    3:3:boolean canUseFilledNewArrayOfObjects():1977 -> L
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> L
-    4:4:boolean canUseFilledNewArrayOfObjects():1977 -> L
-    1:2:boolean keepInnerClassStructure():706:707 -> L0
-    1:1:boolean canUseInputStackMaps():711:711 -> M
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> M
-    2:2:boolean canUseInputStackMaps():711 -> M
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():778:778 -> M0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> N
-    1:1:boolean canUseInvokeCustom():1846 -> N
-    2:2:boolean canUseInvokeCustom():1846:1846 -> N
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> N
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> N
-    3:3:boolean canUseInvokeCustom():1846 -> N
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> N
-    4:4:boolean canUseInvokeCustom():1846 -> N
-    1:1:boolean parseSignatureAttribute():638:638 -> N0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> O
-    1:1:boolean canUseInvokePolymorphic():1834 -> O
-    2:2:boolean canUseInvokePolymorphic():1834:1834 -> O
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> O
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> O
-    3:3:boolean canUseInvokePolymorphic():1834 -> O
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> O
-    4:4:boolean canUseInvokePolymorphic():1834 -> O
-    1:32:boolean printWarnings():1141:1172 -> O0
-    33:72:boolean printWarnings():1168:1207 -> O0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> P
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1830 -> P
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1830:1830 -> P
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> P
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> P
-    3:3:boolean canUseInvokePolymorphicOnVarHandle():1830 -> P
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> P
-    4:4:boolean canUseInvokePolymorphicOnVarHandle():1830 -> P
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():774:774 -> P0
-    1:1:boolean canUseJavaUtilObjects():1932:1932 -> Q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> Q
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> Q
-    2:2:boolean canUseJavaUtilObjects():1932 -> Q
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> Q
-    3:3:boolean canUseJavaUtilObjects():1932 -> Q
-    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1825:1825 -> Q0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> Q0
-    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1825 -> Q0
-    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1825:1826 -> Q0
-    1:1:boolean canUseJavaUtilObjectsIsNull():1936:1936 -> R
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> R
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> R
-    2:2:boolean canUseJavaUtilObjectsIsNull():1936 -> R
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> R
-    3:3:boolean canUseJavaUtilObjectsIsNull():1936 -> R
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():426:426 -> R0
-    1:1:boolean shouldBackportMethods():454 -> R0
-    2:2:boolean shouldBackportMethods():454:454 -> R0
-    1:2:boolean canUseMultidex():1927:1928 -> S
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> S
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> S
-    3:3:boolean canUseMultidex():1928 -> S
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> S
-    4:4:boolean canUseMultidex():1928 -> S
-    1:1:boolean shouldDesugarRecords():527:527 -> S0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1858:1858 -> S0
-    2:2:boolean shouldDesugarRecords():527 -> S0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1899:1899 -> T
-    1:1:boolean canUseNativeDexPcInsteadOfDebugInfo():1903 -> T
-    2:2:boolean canUseNativeDexPcInsteadOfDebugInfo():1903:1903 -> T
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> T
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> T
-    3:3:boolean canUseNativeDexPcInsteadOfDebugInfo():1904 -> T
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> T
-    4:4:boolean canUseNativeDexPcInsteadOfDebugInfo():1904 -> T
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1895:1895 -> T
-    5:5:boolean canUseNativeDexPcInsteadOfDebugInfo():1905 -> T
-    1:1:boolean shouldKeepStackMapTable():458:458 -> T0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():450:450 -> T0
-    2:2:boolean shouldKeepStackMapTable():458 -> T0
-    3:4:boolean shouldKeepStackMapTable():458:459 -> T0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():450:450 -> T0
-    5:5:boolean shouldKeepStackMapTable():460 -> T0
-    6:6:boolean shouldKeepStackMapTable():461:461 -> T0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> U
-    1:1:boolean canUseNotInstruction():2012 -> U
-    2:2:boolean canUseNotInstruction():2012:2012 -> U
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> U
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> U
-    3:3:boolean canUseNotInstruction():2012 -> U
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> U
-    4:4:boolean canUseNotInstruction():2012 -> U
-    1:1:boolean shouldRerunEnqueuer():465:465 -> U0
-    1:1:boolean canUsePrivateInterfaceMethods():1888:1888 -> V
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> V
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> V
-    2:2:boolean canUsePrivateInterfaceMethods():1888 -> V
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> V
-    3:3:boolean canUsePrivateInterfaceMethods():1888 -> V
-    1:18:void signalFinishedToConsumers():501:518 -> V0
-    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1985:1985 -> W
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> W
-    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1986 -> W
-    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1986:1986 -> W
-    1:2:void warningReadingKotlinMetadataReflective():1067:1068 -> W0
-    1:1:boolean canUseSuppressedExceptions():1941:1941 -> X
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> X
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> X
-    2:2:boolean canUseSuppressedExceptions():1941 -> X
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> X
-    3:3:boolean canUseSuppressedExceptions():1941 -> X
-    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():762:762 -> Y
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():786:786 -> Z
+    1:2:boolean canUseFilledNewArrayOfObjects():1964:1965 -> L
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> L
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> L
+    3:3:boolean canUseFilledNewArrayOfObjects():1965 -> L
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> L
+    4:4:boolean canUseFilledNewArrayOfObjects():1965 -> L
+    1:2:boolean keepInnerClassStructure():705:706 -> L0
+    1:1:boolean canUseInputStackMaps():710:710 -> M
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> M
+    2:2:boolean canUseInputStackMaps():710 -> M
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():777:777 -> M0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> N
+    1:1:boolean canUseInvokeCustom():1834 -> N
+    2:2:boolean canUseInvokeCustom():1834:1834 -> N
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> N
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> N
+    3:3:boolean canUseInvokeCustom():1834 -> N
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> N
+    4:4:boolean canUseInvokeCustom():1834 -> N
+    1:1:boolean parseSignatureAttribute():637:637 -> N0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> O
+    1:1:boolean canUseInvokePolymorphic():1822 -> O
+    2:2:boolean canUseInvokePolymorphic():1822:1822 -> O
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> O
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> O
+    3:3:boolean canUseInvokePolymorphic():1822 -> O
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> O
+    4:4:boolean canUseInvokePolymorphic():1822 -> O
+    1:32:boolean printWarnings():1129:1160 -> O0
+    33:72:boolean printWarnings():1156:1195 -> O0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> P
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1818 -> P
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1818:1818 -> P
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> P
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> P
+    3:3:boolean canUseInvokePolymorphicOnVarHandle():1818 -> P
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> P
+    4:4:boolean canUseInvokePolymorphicOnVarHandle():1818 -> P
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():773:773 -> P0
+    1:1:boolean canUseJavaUtilObjects():1920:1920 -> Q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> Q
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> Q
+    2:2:boolean canUseJavaUtilObjects():1920 -> Q
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> Q
+    3:3:boolean canUseJavaUtilObjects():1920 -> Q
+    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1813:1813 -> Q0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> Q0
+    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1813 -> Q0
+    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1813:1814 -> Q0
+    1:1:boolean canUseJavaUtilObjectsIsNull():1924:1924 -> R
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> R
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> R
+    2:2:boolean canUseJavaUtilObjectsIsNull():1924 -> R
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> R
+    3:3:boolean canUseJavaUtilObjectsIsNull():1924 -> R
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():425:425 -> R0
+    1:1:boolean shouldBackportMethods():453 -> R0
+    2:2:boolean shouldBackportMethods():453:453 -> R0
+    1:2:boolean canUseMultidex():1915:1916 -> S
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> S
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> S
+    3:3:boolean canUseMultidex():1916 -> S
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> S
+    4:4:boolean canUseMultidex():1916 -> S
+    1:1:boolean shouldDesugarRecords():526:526 -> S0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1846:1846 -> S0
+    2:2:boolean shouldDesugarRecords():526 -> S0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1887:1887 -> T
+    1:1:boolean canUseNativeDexPcInsteadOfDebugInfo():1891 -> T
+    2:2:boolean canUseNativeDexPcInsteadOfDebugInfo():1891:1891 -> T
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> T
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> T
+    3:3:boolean canUseNativeDexPcInsteadOfDebugInfo():1892 -> T
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> T
+    4:4:boolean canUseNativeDexPcInsteadOfDebugInfo():1892 -> T
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1883:1883 -> T
+    5:5:boolean canUseNativeDexPcInsteadOfDebugInfo():1893 -> T
+    1:1:boolean shouldKeepStackMapTable():457:457 -> T0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():449:449 -> T0
+    2:2:boolean shouldKeepStackMapTable():457 -> T0
+    3:4:boolean shouldKeepStackMapTable():457:458 -> T0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():449:449 -> T0
+    5:5:boolean shouldKeepStackMapTable():459 -> T0
+    6:6:boolean shouldKeepStackMapTable():460:460 -> T0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> U
+    1:1:boolean canUseNotInstruction():2000 -> U
+    2:2:boolean canUseNotInstruction():2000:2000 -> U
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> U
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> U
+    3:3:boolean canUseNotInstruction():2000 -> U
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> U
+    4:4:boolean canUseNotInstruction():2000 -> U
+    1:1:boolean shouldRerunEnqueuer():464:464 -> U0
+    1:1:boolean canUsePrivateInterfaceMethods():1876:1876 -> V
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> V
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> V
+    2:2:boolean canUsePrivateInterfaceMethods():1876 -> V
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> V
+    3:3:boolean canUsePrivateInterfaceMethods():1876 -> V
+    1:18:void signalFinishedToConsumers():500:517 -> V0
+    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1973:1973 -> W
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> W
+    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1974 -> W
+    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1974:1974 -> W
+    1:2:void warningReadingKotlinMetadataReflective():1055:1056 -> W0
+    1:1:boolean canUseSuppressedExceptions():1929:1929 -> X
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> X
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> X
+    2:2:boolean canUseSuppressedExceptions():1929 -> X
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> X
+    3:3:boolean canUseSuppressedExceptions():1929 -> X
+    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():761:761 -> Y
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():785:785 -> Z
     1:1:boolean access$000(java.lang.String):0:0 -> a
-    2:3:boolean com.android.tools.r8.utils.InternalOptions.isSystemPropertyForDevelopmentSet(java.lang.String):815:816 -> a
+    2:3:boolean com.android.tools.r8.utils.InternalOptions.isSystemPropertyForDevelopmentSet(java.lang.String):814:815 -> a
     2:3:boolean access$000(java.lang.String):109 -> a
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
     4:4:com.android.tools.r8.utils.InternalOptions$InlinerOptions access$200(com.android.tools.r8.utils.InternalOptions):109:109 -> a
-    5:6:void setMarker(com.android.tools.r8.dex.Marker):370:371 -> a
-    7:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):375:376 -> a
-    9:15:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):383:389 -> a
-    9:15:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):378 -> a
-    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    16:16:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):390 -> a
-    16:16:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):378 -> a
-    17:22:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):390:395 -> a
-    17:22:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):378 -> a
-    23:23:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> a
-    23:23:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):396 -> a
-    23:23:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):378 -> a
-    24:33:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):396:405 -> a
-    24:33:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):378 -> a
-    34:43:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):412:421 -> a
-    44:45:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):583:584 -> a
-    46:55:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):681:690 -> a
-    56:68:void setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.utils.AndroidApp):895:907 -> a
-    69:77:void setDesugaredLibrarySpecificationForTesting(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path):914:922 -> a
-    78:80:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):996:998 -> a
-    81:81:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> a
-    81:81:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):998 -> a
+    5:6:void setMarker(com.android.tools.r8.dex.Marker):369:370 -> a
+    7:8:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):374:375 -> a
+    9:15:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):382:388 -> a
+    9:15:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):377 -> a
+    16:16:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    16:16:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):389 -> a
+    16:16:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):377 -> a
+    17:22:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):389:394 -> a
+    17:22:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):377 -> a
+    23:23:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> a
+    23:23:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):395 -> a
+    23:23:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):377 -> a
+    24:33:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):395:404 -> a
+    24:33:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):377 -> a
+    34:43:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):411:420 -> a
+    44:45:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):582:583 -> a
+    46:55:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):680:689 -> a
+    56:60:void setDesugaredLibrarySpecificationForTesting(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,java.nio.file.Path,java.nio.file.Path):907:911 -> a
+    61:63:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):984:986 -> a
+    64:64:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> a
+    64:64:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):986 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    82:82:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):998:998 -> a
-    83:83:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):996:996 -> a
-    84:90: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):1040:1046 -> a
-    91:91: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):1041:1041 -> a
-    92:93:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1053:1054 -> a
-    94:94:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> a
-    94:94:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1056 -> a
+    65:65:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):986:986 -> a
+    66:66:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):984:984 -> a
+    67:73: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):1028:1034 -> a
+    74:74: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):1029:1029 -> a
+    75:76:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1041:1042 -> a
+    77:77:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():777:777 -> a
+    77:77:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1044 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    95:101:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1056:1062 -> a
-    102:102:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1054:1054 -> a
-    103:111:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1082:1090 -> a
-    112:112:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1089:1089 -> a
-    113:113:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1083:1083 -> a
-    114:114:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexMethod):1090:1090 -> a
-    115:118:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1095:1098 -> a
-    119:123:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1103:1107 -> a
-    124:130:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1112:1118 -> a
-    131:131:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1113:1113 -> a
-    132:132:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1117:1117 -> a
-    133:138:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1221:1226 -> a
-    139:139:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1820:1820 -> a
-    140:140:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    140:140:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1820 -> a
-    141:142:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1820:1821 -> a
+    78:84:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1044:1050 -> a
+    85:85:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1042:1042 -> a
+    86:94:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1070:1078 -> a
+    95:95:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1077:1077 -> a
+    96:96:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1071:1071 -> a
+    97:97:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexMethod):1078:1078 -> a
+    98:101:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1083:1086 -> a
+    102:106:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1091:1095 -> a
+    107:113:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1100:1106 -> a
+    114:114:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1101:1101 -> a
+    115:115:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1105:1105 -> a
+    116:121:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1209:1214 -> a
+    122:122:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1808:1808 -> a
+    123:123:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    123:123:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1808 -> a
+    124:125:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1808:1809 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():147:147 -> a0
     1:1:int access$100(java.lang.String,int):0:0 -> b
-    2:5:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):823:826 -> b
+    2:5:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):822:825 -> b
     2:5:int access$100(java.lang.String,int):109 -> b
     6:6:com.android.tools.r8.utils.Box access$300(com.android.tools.r8.utils.InternalOptions):109:109 -> b
-    7:40:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1002:1035 -> b
-    41:41:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1106:1106 -> b
+    7:40:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):990:1023 -> b
+    41:41:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1094:1094 -> b
     1:3:void disableAllOptimizations():237:239 -> b0
-    1:1:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():782:782 -> c
-    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1097:1097 -> c
+    1:1:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():781:781 -> c
+    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1085:1085 -> c
     1:13:void disableGlobalOptimizations():243:255 -> c0
-    14:14:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableApiCallerIdentification():1558:1558 -> c0
+    14:14:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableApiCallerIdentification():1546:1546 -> c0
     14:14:void disableGlobalOptimizations():255 -> c0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:boolean assertionsEnabled():963:963 -> d
-    2:11:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1124:1133 -> d
-    12:18:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1129:1135 -> d
-    1:1:void disableNameReflectionOptimization():1787:1787 -> d0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():758:758 -> e
-    1:1:boolean enableBackportedMethodRewriting():1874:1874 -> e0
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> e0
-    2:2:boolean enableBackportedMethodRewriting():1874 -> e0
-    3:3:boolean enableBackportedMethodRewriting():1874:1874 -> e0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> f
-    1:1:boolean canHaveArtCheckCastVerifierBug():2262 -> f
-    2:2:boolean canHaveArtCheckCastVerifierBug():2262:2262 -> f
+    1:1:boolean assertionsEnabled():951:951 -> d
+    2:11:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1112:1121 -> d
+    12:18:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1117:1123 -> d
+    1:1:void disableNameReflectionOptimization():1775:1775 -> d0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():757:757 -> e
+    1:1:boolean enableBackportedMethodRewriting():1862:1862 -> e0
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> e0
+    2:2:boolean enableBackportedMethodRewriting():1862 -> e0
+    3:3:boolean enableBackportedMethodRewriting():1862:1862 -> e0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> f
+    1:1:boolean canHaveArtCheckCastVerifierBug():2250 -> f
+    2:2:boolean canHaveArtCheckCastVerifierBug():2250:2250 -> f
     1:6:void enableProtoShrinking():228:233 -> f0
-    1:1:boolean canHaveArtInstanceOfVerifierBug():2217:2217 -> g
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> g
-    2:2:boolean canHaveArtInstanceOfVerifierBug():2218 -> g
-    3:3:boolean canHaveArtInstanceOfVerifierBug():2218:2218 -> g
-    1:5:boolean enableTryWithResourcesDesugaring():1878:1882 -> g0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1866:1866 -> g0
-    6:6:boolean enableTryWithResourcesDesugaring():1882 -> g0
-    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> g0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791 -> g0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1866 -> g0
-    7:7:boolean enableTryWithResourcesDesugaring():1882 -> g0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1791:1791 -> g0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1866 -> g0
-    8:8:boolean enableTryWithResourcesDesugaring():1882 -> g0
-    9:9:boolean enableTryWithResourcesDesugaring():1884:1884 -> g0
-    1:1:boolean canHaveArtStringNewInitBug():2142:2142 -> h
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> h
-    2:2:boolean canHaveArtStringNewInitBug():2142 -> h
-    3:3:boolean canHaveArtStringNewInitBug():2142:2142 -> h
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():803:811 -> h0
-    1:1:boolean canHaveBoundsCheckEliminationBug():2003:2003 -> i
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> i
-    2:2:boolean canHaveBoundsCheckEliminationBug():2003 -> i
-    3:3:boolean canHaveBoundsCheckEliminationBug():2003:2003 -> i
-    1:9:java.util.Set getExtensiveLoggingFilter():790:798 -> i0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> j
-    1:1:boolean canHaveCmpIfFloatBug():2095 -> j
-    2:2:boolean canHaveCmpIfFloatBug():2095:2095 -> j
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():430:430 -> j0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():426:426 -> j0
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():430 -> j0
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():430:430 -> j0
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():473:473 -> j0
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():431 -> j0
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():432:432 -> j0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():477:477 -> j0
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():433 -> j0
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():434:434 -> j0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> j0
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():435 -> j0
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():436:438 -> j0
-    1:1:boolean canHaveCmpLongBug():2067:2067 -> k
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> k
-    2:2:boolean canHaveCmpLongBug():2067 -> k
-    3:3:boolean canHaveCmpLongBug():2067:2067 -> k
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():579:579 -> k0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2294:2294 -> l
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> l
-    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2294 -> l
-    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2294:2294 -> l
+    1:1:boolean canHaveArtInstanceOfVerifierBug():2205:2205 -> g
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> g
+    2:2:boolean canHaveArtInstanceOfVerifierBug():2206 -> g
+    3:3:boolean canHaveArtInstanceOfVerifierBug():2206:2206 -> g
+    1:5:boolean enableTryWithResourcesDesugaring():1866:1870 -> g0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1854:1854 -> g0
+    6:6:boolean enableTryWithResourcesDesugaring():1870 -> g0
+    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> g0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779 -> g0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1854 -> g0
+    7:7:boolean enableTryWithResourcesDesugaring():1870 -> g0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1779:1779 -> g0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1854 -> g0
+    8:8:boolean enableTryWithResourcesDesugaring():1870 -> g0
+    9:9:boolean enableTryWithResourcesDesugaring():1872:1872 -> g0
+    1:1:boolean canHaveArtStringNewInitBug():2130:2130 -> h
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> h
+    2:2:boolean canHaveArtStringNewInitBug():2130 -> h
+    3:3:boolean canHaveArtStringNewInitBug():2130:2130 -> h
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():802:810 -> h0
+    1:1:boolean canHaveBoundsCheckEliminationBug():1991:1991 -> i
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> i
+    2:2:boolean canHaveBoundsCheckEliminationBug():1991 -> i
+    3:3:boolean canHaveBoundsCheckEliminationBug():1991:1991 -> i
+    1:9:java.util.Set getExtensiveLoggingFilter():789:797 -> i0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> j
+    1:1:boolean canHaveCmpIfFloatBug():2083 -> j
+    2:2:boolean canHaveCmpIfFloatBug():2083:2083 -> j
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():429:429 -> j0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():425:425 -> j0
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():429 -> j0
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():429:429 -> j0
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():472:472 -> j0
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():430 -> j0
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():431:431 -> j0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():476:476 -> j0
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():432 -> j0
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():433:433 -> j0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> j0
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():434 -> j0
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():435:437 -> j0
+    1:1:boolean canHaveCmpLongBug():2055:2055 -> k
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> k
+    2:2:boolean canHaveCmpLongBug():2055 -> k
+    3:3:boolean canHaveCmpLongBug():2055:2055 -> k
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():578:578 -> k0
+    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2282:2282 -> l
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> l
+    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2282 -> l
+    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2282:2282 -> l
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():155:155 -> l0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> m
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2286 -> m
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> m
-    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2286 -> m
-    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2286:2286 -> m
-    1:1:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():931:931 -> m0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> m
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2274 -> m
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> m
+    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2274 -> m
+    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2274:2274 -> m
+    1:1:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():919:919 -> m0
     2:2:com.android.tools.r8.ir.desugar.TypeRewriter com.android.tools.r8.ir.desugar.TypeRewriter.empty():18:18 -> m0
-    2:2:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():932 -> m0
-    3:3:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():933:933 -> m0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> n
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2308 -> n
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> n
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2308 -> n
-    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2308:2308 -> n
-    1:1:boolean hasMethodsFilter():1216:1216 -> n0
-    1:1:boolean canHaveDex2OatInliningIssue():2134:2134 -> o
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> o
-    2:2:boolean canHaveDex2OatInliningIssue():2134 -> o
-    3:3:boolean canHaveDex2OatInliningIssue():2134:2134 -> o
+    2:2:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():920 -> m0
+    3:3:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():921:921 -> m0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> n
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2296 -> n
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> n
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2296 -> n
+    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2296:2296 -> n
+    1:1:boolean hasMethodsFilter():1204:1204 -> n0
+    1:1:boolean canHaveDex2OatInliningIssue():2122:2122 -> o
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> o
+    2:2:boolean canHaveDex2OatInliningIssue():2122 -> o
+    3:3:boolean canHaveDex2OatInliningIssue():2122:2122 -> o
     1:1:boolean hasProguardConfiguration():151:151 -> o0
-    1:1:boolean canHaveDex2OatLinkedListBug():2126:2126 -> p
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> p
-    2:2:boolean canHaveDex2OatLinkedListBug():2126 -> p
-    3:3:boolean canHaveDex2OatLinkedListBug():2126:2126 -> p
-    1:1:boolean hasUsageInformationConsumer():882:882 -> p0
-    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2175:2175 -> q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> q
-    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2175 -> q
-    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2175:2175 -> q
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():770:770 -> q0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> r
-    1:1:boolean canHaveExceptionTypeBug():2254 -> r
-    2:2:boolean canHaveExceptionTypeBug():2254:2254 -> r
-    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():766:766 -> r0
-    1:1:boolean canHaveForwardingInitInliningBug():2163:2163 -> s
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> s
-    2:2:boolean canHaveForwardingInitInliningBug():2163 -> s
-    3:3:boolean canHaveForwardingInitInliningBug():2163:2163 -> s
-    1:1:boolean isDesugaredLibraryCompilation():446:446 -> s0
-    1:1:boolean canHaveInvokeInterfaceToObjectMethodBug():2351:2351 -> t
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> t
-    2:2:boolean canHaveInvokeInterfaceToObjectMethodBug():2351 -> t
-    3:3:boolean canHaveInvokeInterfaceToObjectMethodBug():2351:2351 -> t
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> t0
-    1:1:boolean isDesugaring():485 -> t0
-    2:2:boolean isDesugaring():485:485 -> t0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> u
-    1:1:boolean canHaveLongToIntBug():2241 -> u
-    2:2:boolean canHaveLongToIntBug():2241:2241 -> u
-    1:1:boolean isGeneratingClassFiles():481:481 -> u0
-    1:1:boolean canHaveMul2AddrBug():2117:2117 -> v
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> v
-    2:2:boolean canHaveMul2AddrBug():2117 -> v
-    3:3:boolean canHaveMul2AddrBug():2117:2117 -> v
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():473:473 -> v0
-    1:1:boolean isGeneratingDex():469 -> v0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():477:477 -> v0
-    2:2:boolean isGeneratingDex():469 -> v0
-    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2150:2150 -> w
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> w
-    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2150 -> w
-    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2150:2150 -> w
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():426:426 -> w0
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1910 -> w0
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1913:1915 -> w0
-    1:1:boolean canHaveOverlappingLongRegisterBug():2034:2034 -> x
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> x
-    2:2:boolean canHaveOverlappingLongRegisterBug():2034 -> x
-    3:3:boolean canHaveOverlappingLongRegisterBug():2034:2034 -> x
-    1:1:boolean isKeepAttributesSignatureEnabled():643:643 -> x0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> y
-    1:1:boolean canHaveSuperInvokeBug():2339 -> y
-    2:2:boolean canHaveSuperInvokeBug():2339:2339 -> y
-    1:1:boolean isKeepEnclosingMethodAttributeEnabled():648:648 -> y0
-    1:1:boolean canHaveSwitchMaxIntBug():2323:2323 -> z
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():579:579 -> z
-    2:2:boolean canHaveSwitchMaxIntBug():2323 -> z
-    3:3:boolean canHaveSwitchMaxIntBug():2323:2323 -> z
-    1:1:boolean isKeepInnerClassesAttributeEnabled():653:653 -> z0
-com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.bu:
+    1:1:boolean canHaveDex2OatLinkedListBug():2114:2114 -> p
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> p
+    2:2:boolean canHaveDex2OatLinkedListBug():2114 -> p
+    3:3:boolean canHaveDex2OatLinkedListBug():2114:2114 -> p
+    1:1:boolean hasUsageInformationConsumer():881:881 -> p0
+    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2163:2163 -> q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> q
+    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2163 -> q
+    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2163:2163 -> q
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():769:769 -> q0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> r
+    1:1:boolean canHaveExceptionTypeBug():2242 -> r
+    2:2:boolean canHaveExceptionTypeBug():2242:2242 -> r
+    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():765:765 -> r0
+    1:1:boolean canHaveForwardingInitInliningBug():2151:2151 -> s
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> s
+    2:2:boolean canHaveForwardingInitInliningBug():2151 -> s
+    3:3:boolean canHaveForwardingInitInliningBug():2151:2151 -> s
+    1:1:boolean isDesugaredLibraryCompilation():445:445 -> s0
+    1:1:boolean canHaveInvokeInterfaceToObjectMethodBug():2339:2339 -> t
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> t
+    2:2:boolean canHaveInvokeInterfaceToObjectMethodBug():2339 -> t
+    3:3:boolean canHaveInvokeInterfaceToObjectMethodBug():2339:2339 -> t
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> t0
+    1:1:boolean isDesugaring():484 -> t0
+    2:2:boolean isDesugaring():484:484 -> t0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> u
+    1:1:boolean canHaveLongToIntBug():2229 -> u
+    2:2:boolean canHaveLongToIntBug():2229:2229 -> u
+    1:1:boolean isGeneratingClassFiles():480:480 -> u0
+    1:1:boolean canHaveMul2AddrBug():2105:2105 -> v
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> v
+    2:2:boolean canHaveMul2AddrBug():2105 -> v
+    3:3:boolean canHaveMul2AddrBug():2105:2105 -> v
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():472:472 -> v0
+    1:1:boolean isGeneratingDex():468 -> v0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():476:476 -> v0
+    2:2:boolean isGeneratingDex():468 -> v0
+    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2138:2138 -> w
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> w
+    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2138 -> w
+    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2138:2138 -> w
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():425:425 -> w0
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1898 -> w0
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1901:1903 -> w0
+    1:1:boolean canHaveOverlappingLongRegisterBug():2022:2022 -> x
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> x
+    2:2:boolean canHaveOverlappingLongRegisterBug():2022 -> x
+    3:3:boolean canHaveOverlappingLongRegisterBug():2022:2022 -> x
+    1:1:boolean isKeepAttributesSignatureEnabled():642:642 -> x0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> y
+    1:1:boolean canHaveSuperInvokeBug():2327 -> y
+    2:2:boolean canHaveSuperInvokeBug():2327:2327 -> y
+    1:1:boolean isKeepEnclosingMethodAttributeEnabled():647:647 -> y0
+    1:1:boolean canHaveSwitchMaxIntBug():2311:2311 -> z
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():578:578 -> z
+    2:2:boolean canHaveSwitchMaxIntBug():2311 -> z
+    3:3:boolean canHaveSwitchMaxIntBug():2311:2311 -> z
+    1:1:boolean isKeepInnerClassesAttributeEnabled():652:652 -> z0
+com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.Ut:
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
-    1:1:void <clinit>():1878:1878 -> <clinit>
-com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.cu$a:
+    1:1:void <clinit>():1866:1866 -> <clinit>
+com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.Vt$a:
     java.util.function.BiConsumer tracedMethodApiLevelCallback -> h
     boolean enableApiCallerIdentification -> a
     java.util.Map methodApiMapping -> e
@@ -123138,55 +122718,55 @@
     boolean enableStubbingOfClasses -> c
     java.util.Map classApiMapping -> g
     boolean enableOutliningOfMethods -> d
-    1:16:void <init>():1521:1536 -> <init>
-    1:12:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):1540:1551 -> a
-    13:13:void lambda$visitMockedApiLevelsForReferences$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference,com.android.tools.r8.utils.AndroidApiLevel):1545:1545 -> a
-    14:14:void lambda$visitMockedApiLevelsForReferences$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):1549:1549 -> a
-    15:15:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):1553:1553 -> a
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.cu$b:
+    1:16:void <init>():1509:1524 -> <init>
+    1:12:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):1528:1539 -> a
+    13:13:void lambda$visitMockedApiLevelsForReferences$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference,com.android.tools.r8.utils.AndroidApiLevel):1533:1533 -> a
+    14:14:void lambda$visitMockedApiLevelsForReferences$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):1537:1537 -> a
+    15:15:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):1541:1541 -> a
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.Vt$b:
     com.android.tools.r8.utils.InternalOptions this$0 -> d
     boolean $assertionsDisabled -> e
     boolean enabled -> a
     boolean enableMethodStaticizing -> b
     boolean forceSyntheticsForInstanceInitializers -> c
-    1:1:void <clinit>():1303:1303 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):1303:1308 -> <init>
-    1:1:void disableOptimization():1311:1311 -> a
-    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableMethodStaticizing(boolean):1349:1349 -> a
-    1:4:boolean isEnabled():1319:1322 -> b
-    5:5:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1335:1335 -> b
-    6:6:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1311:1311 -> b
-    6:6:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1337 -> b
-    1:1:boolean isForceSyntheticsForInstanceInitializersEnabled():1326:1326 -> c
-    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setForceSyntheticsForInstanceInitializers(boolean):1344:1344 -> c
-    1:1:boolean isMethodStaticizingEnabled():1330:1330 -> d
-com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.cu$c:
+    1:1:void <clinit>():1291:1291 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):1291:1296 -> <init>
+    1:1:void disableOptimization():1299:1299 -> a
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableMethodStaticizing(boolean):1337:1337 -> a
+    1:4:boolean isEnabled():1307:1310 -> b
+    5:5:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1323:1323 -> b
+    6:6:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1299:1299 -> b
+    6:6:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1325 -> b
+    1:1:boolean isForceSyntheticsForInstanceInitializersEnabled():1314:1314 -> c
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setForceSyntheticsForInstanceInitializers(boolean):1332:1332 -> c
+    1:1:boolean isMethodStaticizingEnabled():1318:1318 -> d
+com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.Vt$c:
     com.android.tools.r8.utils.InternalOptions this$0 -> b
     boolean $assertionsDisabled -> c
     int classInliningInstructionAllowance -> a
-    1:1:void <clinit>():1354:1354 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1354:1356 -> <init>
-    1:4:int getClassInliningInstructionAllowance():1359:1362 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    5:5:int getClassInliningInstructionAllowance():1362 -> a
+    1:1:void <clinit>():1342:1342 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1342:1344 -> <init>
+    1:4:int getClassInliningInstructionAllowance():1347:1350 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    5:5:int getClassInliningInstructionAllowance():1350 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    6:6:int getClassInliningInstructionAllowance():1362 -> a
-    7:7:int getClassInliningInstructionAllowance():1365:1365 -> a
-com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.cu$d:
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    6:6:int getClassInliningInstructionAllowance():1350 -> a
+    7:7:int getClassInliningInstructionAllowance():1353:1353 -> a
+com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.Vt$d:
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
     boolean noCfMarkerForDesugaredCode -> c
     boolean lambdaClassFieldsFinal -> d
-    1:15:void <init>():1286:1300 -> <init>
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.cu$e:
+    1:15:void <init>():1274:1288 -> <init>
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.Vt$e:
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> c
     1:2:void <clinit>():124:125 -> <clinit>
     1:1:void <init>(java.lang.String,int):123:123 -> <init>
     1:1:boolean isOff():128:128 -> a
     1:1:boolean isOn():132:132 -> b
-com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.cu$f:
+com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.Vt$f:
     boolean enableSyntheticMerging -> e
     boolean restrictToSynthetics -> f
     com.android.tools.r8.utils.InternalOptions this$0 -> g
@@ -123195,23 +122775,23 @@
     boolean enableClassInitializerDeadlockDetection -> b
     boolean enableInterfaceMerging -> c
     boolean enableInterfaceMergingInInitial -> d
-    1:1:void <clinit>():1419:1419 -> <clinit>
-    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1419:1432 -> <init>
-    1:1:void disable():1435:1435 -> a
-    2:2:void enableIf(boolean):1447:1447 -> a
-    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1467:1473 -> a
-    1:1:void disableSyntheticMerging():1439:1439 -> b
-    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1486:1492 -> b
-    1:1:void enable():1443:1443 -> c
+    1:1:void <clinit>():1407:1407 -> <clinit>
+    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1407:1420 -> <init>
+    1:1:void disable():1423:1423 -> a
+    2:2:void enableIf(boolean):1435:1435 -> a
+    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1455:1461 -> a
+    1:1:void disableSyntheticMerging():1427:1427 -> b
+    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1474:1480 -> b
+    1:1:void enable():1431:1431 -> c
     int getMaxClassGroupSize() -> d
-    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1463:1463 -> e
-    1:1:boolean isRestrictedToSynthetics():1497:1497 -> f
-    1:1:boolean isSyntheticMergingEnabled():1482:1482 -> g
-    1:1:void setEnableClassInitializerDeadlockDetection():1501:1501 -> h
-    1:1:void setEnableInterfaceMerging():1505:1505 -> i
-    1:1:void setEnableInterfaceMergingInInitial():1509:1509 -> j
-    1:1:void setRestrictToSynthetics():1517:1517 -> k
-com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.cu$g:
+    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1451:1451 -> e
+    1:1:boolean isRestrictedToSynthetics():1485:1485 -> f
+    1:1:boolean isSyntheticMergingEnabled():1470:1470 -> g
+    1:1:void setEnableClassInitializerDeadlockDetection():1489:1489 -> h
+    1:1:void setEnableInterfaceMerging():1493:1493 -> i
+    1:1:void setEnableInterfaceMergingInInitial():1497:1497 -> j
+    1:1:void setRestrictToSynthetics():1505:1505 -> k
+com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.Vt$g:
     boolean $assertionsDisabled -> m
     boolean enableInliningOfInvokesWithClassInitializationSideEffects -> i
     boolean enableInliningOfInvokesWithNullableReceivers -> j
@@ -123225,52 +122805,52 @@
     int[] multiCallerInliningInstructionLimits -> c
     boolean applyInliningToInlinee -> g
     boolean enableInlining -> a
-    1:1:void <clinit>():1370:1370 -> <clinit>
-    1:33:void <init>(com.android.tools.r8.utils.InternalOptions):1370:1402 -> <init>
-    1:5:int getSimpleInliningInstructionLimit():1406:1410 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    6:6:int getSimpleInliningInstructionLimit():1410 -> a
+    1:1:void <clinit>():1358:1358 -> <clinit>
+    1:33:void <init>(com.android.tools.r8.utils.InternalOptions):1358:1390 -> <init>
+    1:5:int getSimpleInliningInstructionLimit():1394:1398 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    6:6:int getSimpleInliningInstructionLimit():1398 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    7:7:int getSimpleInliningInstructionLimit():1410 -> a
-    8:8:int getSimpleInliningInstructionLimit():1414:1414 -> a
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.du:
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    7:7:int getSimpleInliningInstructionLimit():1398 -> a
+    8:8:int getSimpleInliningInstructionLimit():1402:1402 -> a
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.Wt:
     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):839:842 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.eu:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):838:841 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.Xt:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1279:1281 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.cu$h:
+    1:3:void <init>():1267:1269 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.Vt$h:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> c
     1:2:void <clinit>():119:120 -> <clinit>
     1:1:void <init>(java.lang.String,int):118:118 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.cu$i:
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.Vt$i:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:5:void <init>():1271:1275 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.cu$j:
+    1:5:void <init>():1259:1263 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.Vt$j:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> e
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode MINIFICATION -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> b
-    1:8:void <clinit>():1241:1248 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1239:1239 -> <init>
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.cu$k:
+    1:8:void <clinit>():1229:1236 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1227:1227 -> <init>
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.Vt$k:
     boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:7:void <init>():1562:1568 -> <init>
-    1:1:boolean enableRemoveProtoEnumSwitchMap():1582:1582 -> a
-    1:1:boolean isEnumLiteProtoShrinkingEnabled():1593:1593 -> b
-    1:1:boolean isProtoShrinkingEnabled():1586:1586 -> c
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.cu$l:
+    1:7:void <init>():1550:1556 -> <init>
+    1:1:boolean enableRemoveProtoEnumSwitchMap():1570:1570 -> a
+    1:1:boolean isEnumLiteProtoShrinkingEnabled():1581:1581 -> b
+    1:1:boolean isProtoShrinkingEnabled():1574:1574 -> c
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.Vt$l:
     boolean allowCheckDiscardedErrors -> m
     boolean disableMarkingClassesFinal -> d0
     boolean keepMetadataInR8IfNotRewritten -> f0
@@ -123282,7 +122862,7 @@
     java.lang.Runnable hookInIrConversion -> q0
     boolean allowStaticInterfaceMethodsForPreNApiLevel -> T
     boolean enableInvokeSuperToInvokeVirtualRewriting -> y
-    boolean placeExceptionalBlocksLast -> C
+    boolean invertConditionals -> C
     java.util.Set allowedUnusedDontWarnPatterns -> a0
     boolean allowClassInliningOfSynthetics -> n
     java.util.function.BiConsumer irModifier -> K
@@ -123309,7 +122889,7 @@
     java.util.function.Consumer inlineeIrModifier -> L
     boolean allowConflictingSyntheticTypes -> h0
     boolean allowNonAbstractClassesWithAbstractMethods -> j0
-    boolean dontCreateMarkerInD8 -> D
+    boolean placeExceptionalBlocksLast -> D
     boolean dontReportFailingCheckDiscarded -> N
     boolean testEnableTestAssertions -> e0
     boolean allowInjectedAnnotationMethods -> o
@@ -123325,7 +122905,7 @@
     boolean allowUnnecessaryDontWarnWildcards -> s
     byte[] forceDexVersionBytes -> b
     boolean checkForNotExpandingMainDexTracingResult -> Z
-    boolean forceJumboStringProcessing -> E
+    boolean dontCreateMarkerInD8 -> E
     java.util.function.Consumer waveModifier -> l
     boolean forceRedundantConstNumberRemoval -> A
     com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions minifier -> p0
@@ -123341,28 +122921,28 @@
     boolean allowUnusedDontWarnRules -> t
     com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorEventConsumer argumentPropagatorEventConsumer -> a
     boolean disableStackMapVerification -> m0
-    boolean forcePcBasedEncoding -> F
-    boolean invertConditionals -> B
+    boolean forceJumboStringProcessing -> F
+    boolean enableExperimentalProtoNormalization -> B
     boolean enableD8ResourcesPassThrough -> i0
     boolean verifyKeptGraphInfo -> k0
-    1:178:void <init>():1597:1774 -> <init>
+    1:178:void <init>():1585:1762 -> <init>
     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):1600:1600 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.cu$l$a:
+    1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1588:1588 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.Vt$l$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1745:1747 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1751:1752 -> 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):1753:1753 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.cu$l$b:
+    1:3:void <init>():1733:1735 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1739:1740 -> 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):1741:1741 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.Vt$l$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1763:1766 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.fu:
+    1:4:void <init>():1751:1754 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.Yt:
     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):851:853 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.gu:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):850:852 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.Zt:
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> d
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> b
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> c
@@ -123370,7 +122950,7 @@
     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.Qu:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.Ju:
     1:7:boolean allIdentical(java.lang.Iterable,java.util.function.Function):27:33 -> a
     8:9:boolean any(java.lang.Iterable,java.util.function.Function,java.util.function.Predicate):43:44 -> a
     10:10:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):92:92 -> a
@@ -123392,7 +122972,7 @@
     1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):92:92 -> d
     2:2:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):49:49 -> d
     2:2:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):92 -> d
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Zu:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Su:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:java.util.Iterator createCircularIterator(java.lang.Iterable):21:22 -> a
@@ -123405,12 +122985,12 @@
     1:3:java.lang.Object nextUntil(java.util.Iterator,java.util.function.Predicate):82:84 -> b
     4:6:java.lang.Object peekPrevious(java.util.ListIterator):92:94 -> b
     7:13:java.lang.Object previousUntil(java.util.ListIterator,java.util.function.Predicate):109:115 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Xu:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Qu:
     java.util.Iterator iterator -> b
     java.lang.Iterable val$iterable -> c
     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.Yu:
+com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.Ru:
     java.util.Iterator val$iterator -> c
     java.lang.Object next -> b
     java.util.function.Predicate val$predicate -> d
@@ -123419,7 +122999,7 @@
     1:3:java.lang.Object advance():55:57 -> j
     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.yv:
+com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.rv:
     com.android.tools.r8.StringConsumer consumer -> c
     java.lang.String separator -> b
     java.lang.StringBuilder builder -> d
@@ -123428,7 +123008,7 @@
     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.tA:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.mA:
     int rowCapacity -> b
     int columnCapacity -> c
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -123436,15 +123016,15 @@
     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 -> f
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.sA:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.lA:
     int columnCapacity -> b
     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.SA:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.LA:
     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 -> d
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.XA:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.QA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -123455,7 +123035,7 @@
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.jB:
+com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.cB:
     1:1:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.GraphLens.rewriteReference(com.android.tools.r8.graph.DexReference):640:640 -> a
     1:1:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):28 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -123463,7 +123043,7 @@
     3:3:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     3:3:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31 -> a
     4:7: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.lB:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.eB:
     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
@@ -123471,214 +123051,223 @@
     3:5:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13 -> a
     6:6:com.android.tools.r8.graph.DexLibraryClass com.android.tools.r8.utils.LibraryClassCollection.resolveClassConflict(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexLibraryClass):21:21 -> a
     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 -> e
+    1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41,"2":42,"3":43}}
     41:41:java.lang.String toString():39:39 -> toString
     42:42:java.lang.String toString():39:39 -> toString
     43:43:java.lang.String toString():39:39 -> toString
     40:40:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.KB:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():91:91 -> <clinit>
+    1:1:void <clinit>():90:90 -> <clinit>
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
-    1:1:void lambda$getMappedRangesForPosition$11(java.lang.Object):810 -> a
-    2:2:com.android.tools.r8.ir.code.Position access$1300(com.android.tools.r8.graph.DexDebugPositionState):91:91 -> a
-    3:3:void access$1700(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):91:91 -> a
-    4:12:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):340:348 -> a
-    13:23:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):346:356 -> a
-    24:32: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):482:490 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1895:1895 -> a
-    33:33: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):490 -> a
+    1:1:void lambda$getMappedRangesForPosition$11(java.lang.Object):799 -> a
+    2:2:com.android.tools.r8.ir.code.Position access$1300(com.android.tools.r8.graph.DexDebugPositionState):90:90 -> a
+    3:3:void access$1700(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):90:90 -> a
+    4:14:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles):338:348 -> a
+    15:23: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,com.android.tools.r8.utils.OriginalSourceFiles):471:479 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1883:1883 -> a
+    24:24: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,com.android.tools.r8.utils.OriginalSourceFiles):479 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1895:1895 -> a
-    34:34: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):490 -> a
-    35:39: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):490:494 -> a
-    40:40:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269:269 -> a
-    40:40: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):494 -> a
-    41:41:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):265:265 -> a
-    41:41:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269 -> a
-    41:41: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):494 -> a
-    42:72: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):497:527 -> a
-    73:73: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):526:526 -> a
-    74:76:void com.android.tools.r8.utils.LineNumberOptimizer.addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):898:900 -> a
-    74:76: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):531 -> a
-    77:77: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):535:535 -> a
-    78:96: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):534:552 -> a
-    97:97:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):819:819 -> a
-    97:97: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):552 -> a
-    98:98:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    98:98:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):819 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1883:1883 -> a
+    25:25: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,com.android.tools.r8.utils.OriginalSourceFiles):479 -> a
+    26:30: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,com.android.tools.r8.utils.OriginalSourceFiles):479:483 -> a
+    31:31:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269:269 -> a
+    31:31: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,com.android.tools.r8.utils.OriginalSourceFiles):483 -> a
+    32:32:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):265:265 -> a
+    32:32:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):269 -> a
+    32:32: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,com.android.tools.r8.utils.OriginalSourceFiles):483 -> a
+    33:63: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,com.android.tools.r8.utils.OriginalSourceFiles):486:516 -> a
+    64:64: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,com.android.tools.r8.utils.OriginalSourceFiles):515:515 -> a
+    65:67:void com.android.tools.r8.utils.LineNumberOptimizer.addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,java.util.function.Supplier):887:889 -> a
+    65: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,com.android.tools.r8.utils.OriginalSourceFiles):520 -> a
+    68:68: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,com.android.tools.r8.utils.OriginalSourceFiles):524:524 -> a
+    69:87: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,com.android.tools.r8.utils.OriginalSourceFiles):523:541 -> a
+    88:88:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):808:808 -> a
+    88:88: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    89:89:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):808 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    98:98: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):552 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():481:481 -> a
-    99:99:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):819 -> a
-    99:99: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):552 -> a
-    100:115:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):819:834 -> a
-    100:115: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):552 -> a
-    116:116:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():619:619 -> a
-    116:116: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):186 -> a
+    89:89: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    90:90:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():480:480 -> a
+    90:90:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):808 -> a
+    90:90: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    91:106:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):808:823 -> a
+    91:106: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():618:618 -> a
+    107:107: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):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    116:116:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):834 -> a
-    116:116: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):552 -> a
-    117:117: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):187:187 -> a
-    117:117:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):834 -> a
-    117:117: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):552 -> a
-    118:134:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):838:854 -> a
-    118:134: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):552 -> a
-    135:155: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):556:576 -> a
-    156:168:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1134:1146 -> a
-    156:168: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):579 -> a
-    169:169:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    169:169:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1146 -> a
+    107:107:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):823 -> a
+    107:107: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    108:108: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):187:187 -> a
+    108:108:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):823 -> a
+    108:108: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    109:125:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):827:843 -> a
+    109:125: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,com.android.tools.r8.utils.OriginalSourceFiles):541 -> a
+    126:144: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,com.android.tools.r8.utils.OriginalSourceFiles):545:563 -> a
+    145:145:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1887:1887 -> a
+    145:145: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,com.android.tools.r8.utils.OriginalSourceFiles):563 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    169:169: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):579 -> a
-    170:203:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1146:1179 -> a
-    170:203: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):579 -> a
-    204:219:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1176:1191 -> a
-    204:219: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):579 -> a
-    220:223:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1190:1193 -> a
-    220:223: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):579 -> a
-    224:224: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):584:584 -> a
-    225:238:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):989:1002 -> a
-    225:238: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    239:239:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    239:239:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1002 -> a
+    146:146:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():1887:1887 -> a
+    146:146: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,com.android.tools.r8.utils.OriginalSourceFiles):563 -> a
+    147:149: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,com.android.tools.r8.utils.OriginalSourceFiles):563:565 -> a
+    150:158:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.DexCode):947:955 -> a
+    150:158: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,com.android.tools.r8.utils.OriginalSourceFiles):565 -> a
+    159:171:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1123:1135 -> a
+    159:171: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    172:172:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    172:172:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1135 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    239:239: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    240:249:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1002:1011 -> a
-    240:249: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    250:250:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    250:250:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1011 -> a
+    172:172: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    173:206:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1135:1168 -> a
+    173:206: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    207:222:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1165:1180 -> a
+    207:222: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    223:226:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1179:1182 -> a
+    223:226: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,com.android.tools.r8.utils.OriginalSourceFiles):568 -> a
+    227:227: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,com.android.tools.r8.utils.OriginalSourceFiles):573:573 -> a
+    228:241:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):978:991 -> a
+    228:241: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    242:242:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    242:242:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):991 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    250:250:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    251:328:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1011:1088 -> a
-    251:328: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    329:329:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1895:1895 -> a
-    329:329:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1088 -> a
-    329:329: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
+    242:242: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    243:252:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):991:1000 -> a
+    243:252: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    253:253:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    253:253:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1000 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    253:253: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    254:331:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1000:1077 -> a
+    254:331: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    332:332:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1883:1883 -> a
+    332:332:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1077 -> a
+    332:332: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    330:330:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1895:1895 -> a
-    330:330:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1088 -> a
-    330:330: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    331:343:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1089:1101 -> a
-    331:343: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    344:347:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):1200:1203 -> a
-    344:347:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1102 -> a
-    344:347: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    348:348:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1104:1104 -> a
-    348:348: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):583 -> a
-    349:350: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):586:587 -> a
-    351:353:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):974:976 -> a
-    351:353: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
-    354:354: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):588:588 -> a
-    355:367:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1210:1222 -> a
-    355:367: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589 -> a
-    368:379:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1242:1253 -> a
-    368:379:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1222 -> a
-    368:379: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589 -> a
-    380:380:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1245:1245 -> a
-    380:380:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1222 -> a
-    380:380: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589 -> a
-    381:394:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1222:1235 -> a
-    381:394: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589 -> a
-    395:395:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176:176 -> a
-    395:395:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1235 -> a
-    395:395: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589 -> a
-    396:396:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):202:202 -> a
-    396:396:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
-    396:396:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1235 -> a
-    396:396: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589 -> a
-    397:397:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):194:194 -> a
-    397:397:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):176 -> a
-    397:397:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1235 -> a
-    397:397: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589 -> a
-    398:398:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1228:1228 -> a
-    398:398: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589 -> a
-    399:406: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):591:598 -> a
-    407:407:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    407:407: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):598 -> a
+    333:333:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1883:1883 -> a
+    333:333:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1077 -> a
+    333:333: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    334:346:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1078:1090 -> a
+    334:346: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    347:350:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):1189:1192 -> a
+    347:350:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1091 -> a
+    347:350: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    351:351:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1093:1093 -> a
+    351:351: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,com.android.tools.r8.utils.OriginalSourceFiles):572 -> a
+    352:353: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,com.android.tools.r8.utils.OriginalSourceFiles):575:576 -> a
+    354:356:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):963:965 -> a
+    354:356: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,com.android.tools.r8.utils.OriginalSourceFiles):576 -> a
+    357:357: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,com.android.tools.r8.utils.OriginalSourceFiles):577:577 -> a
+    358:370:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1199:1211 -> a
+    358:370: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    371:382:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1231:1242 -> a
+    371:382:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211 -> a
+    371:382: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    383:383:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1234:1234 -> a
+    383:383:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211 -> a
+    383:383: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    384:397:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1211:1224 -> a
+    384:397: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    398:398:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177:177 -> a
+    398:398:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1224 -> a
+    398:398: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    399:399:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):203:203 -> a
+    399:399:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
+    399:399:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1224 -> a
+    399:399: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    400:400:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):195:195 -> a
+    400:400:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):177 -> a
+    400:400:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1224 -> a
+    400:400: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    401:401:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1217:1217 -> a
+    401:401: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,com.android.tools.r8.utils.OriginalSourceFiles):578 -> a
+    402:409: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,com.android.tools.r8.utils.OriginalSourceFiles):580:587 -> a
+    410:410:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    410:410: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,com.android.tools.r8.utils.OriginalSourceFiles):587 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    408:426: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):599:617 -> a
-    427:455: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):615:643 -> a
-    456:463:com.android.tools.r8.graph.DexMethod com.android.tools.r8.utils.LineNumberOptimizer.getOutlineMethod(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):768:775 -> a
-    456:463: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):643 -> a
-    464:466: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):645:647 -> a
-    467:467:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder.build():56:56 -> a
-    467:467: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):648 -> a
-    468:533: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):648:713 -> a
-    534:572: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):705:743 -> a
-    573:583: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):742:752 -> a
-    584:597: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,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):751:764 -> a
-    598:599:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):508:509 -> a
-    600:600:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):507:507 -> a
-    601:601:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):631:631 -> a
-    602:602:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$6(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):639:639 -> a
-    603:603:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):640:640 -> a
-    604:618:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):725:739 -> a
-    619:619:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):731:731 -> a
-    620:620:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$10(com.android.tools.r8.graph.DexMethod):743:743 -> a
-    621:621:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):790:790 -> a
-    622:634:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):788:800 -> a
-    635:642:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):797:804 -> a
-    643:643:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.builder():109:109 -> a
-    643:643:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):804 -> a
-    644:647:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):804:807 -> a
-    648:648:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):806:806 -> a
-    649:649:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):805:805 -> a
-    650:650:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction.create(int):269:269 -> a
-    650:650:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):808 -> a
-    651:652:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):808:809 -> a
-    653:662:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):803:812 -> a
-    663:663:void sortMethods(java.util.List):882:882 -> a
-    664:665:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):884:885 -> a
-    666:666:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1232:1232 -> a
-    666:666:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):888 -> a
-    667:667: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):910:910 -> a
-    668:672:void lambda$addFieldsToClassNaming$13(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):912:916 -> a
-    673:673:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):185:185 -> a
-    673:673:void lambda$addFieldsToClassNaming$13(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):917 -> a
-    674:674:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
-    674:674:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
-    674:674:void lambda$addFieldsToClassNaming$13(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):917 -> a
-    675:675:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
-    675:675:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    411:429: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,com.android.tools.r8.utils.OriginalSourceFiles):588:606 -> a
+    430:458: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,com.android.tools.r8.utils.OriginalSourceFiles):604:632 -> a
+    459:466:com.android.tools.r8.graph.DexMethod com.android.tools.r8.utils.LineNumberOptimizer.getOutlineMethod(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):757:764 -> a
+    459:466: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,com.android.tools.r8.utils.OriginalSourceFiles):632 -> a
+    467:469: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,com.android.tools.r8.utils.OriginalSourceFiles):634:636 -> a
+    470:470:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder.build():56:56 -> a
+    470:470: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,com.android.tools.r8.utils.OriginalSourceFiles):637 -> a
+    471:536: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,com.android.tools.r8.utils.OriginalSourceFiles):637:702 -> a
+    537:575: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,com.android.tools.r8.utils.OriginalSourceFiles):694:732 -> a
+    576:586: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,com.android.tools.r8.utils.OriginalSourceFiles):731:741 -> a
+    587:600: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,com.android.tools.r8.utils.OriginalSourceFiles):740:753 -> a
+    601:602:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):497:498 -> a
+    603:603:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):496:496 -> a
+    604:604:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):620:620 -> a
+    605:605:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$6(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):628:628 -> a
+    606:606:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):629:629 -> a
+    607:621:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):714:728 -> a
+    622:622:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):720:720 -> a
+    623:623:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$10(com.android.tools.r8.graph.DexMethod):732:732 -> a
+    624:624:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):779:779 -> a
+    625:637:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):777:789 -> a
+    638:645:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):786:793 -> a
+    646:646:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.builder():109:109 -> a
+    646:646:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):793 -> a
+    647:650:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):793:796 -> a
+    651:651:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):795:795 -> a
+    652:652:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):794:794 -> a
+    653:653:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction.create(int):269:269 -> a
+    653:653:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):797 -> a
+    654:655:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):797:798 -> a
+    656:665:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):792:801 -> a
+    666:666:void sortMethods(java.util.List):871:871 -> a
+    667:668:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):873:874 -> a
+    669:669:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1232:1232 -> a
+    669:669:int lambda$sortMethods$12(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):877 -> a
+    670:670: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):899:899 -> a
+    671:675:void lambda$addFieldsToClassNaming$13(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):901:905 -> a
+    676:676:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):185:185 -> a
+    676:676:void lambda$addFieldsToClassNaming$13(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):906 -> a
+    677:677:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
+    677:677:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    677:677:void lambda$addFieldsToClassNaming$13(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):906 -> a
+    678:678:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
+    678:678:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    675:675:void lambda$addFieldsToClassNaming$13(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):917 -> a
-    676:676:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
-    676:676:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
-    676:676:void lambda$addFieldsToClassNaming$13(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):917 -> a
-    677:678:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186:187 -> a
-    677:678:void lambda$addFieldsToClassNaming$13(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):917 -> a
-    679:680:void lambda$addFieldsToClassNaming$13(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):918:919 -> a
-    681:687:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):926:932 -> a
-    688:688:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    688:688:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):933 -> a
+    678:678:void lambda$addFieldsToClassNaming$13(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):906 -> a
+    679:679:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
+    679:679:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    679:679:void lambda$addFieldsToClassNaming$13(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):906 -> a
+    680:681:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186:187 -> a
+    680:681:void lambda$addFieldsToClassNaming$13(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):906 -> a
+    682:683:void lambda$addFieldsToClassNaming$13(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):907:908 -> a
+    684:690:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):915:921 -> a
+    691:691:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    691:691:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):922 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    689:693:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):934:938 -> a
-    694:694:java.util.List lambda$groupMethodsByRenamedName$14(com.android.tools.r8.graph.DexString):937:937 -> a
-    695:702:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):945:952 -> a
-    703:705:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):974:976 -> a
-    703:705:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):952 -> a
-    706:714:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):958:966 -> a
-    715:726:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1242:1253 -> a
-    715:726:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):91 -> a
-    727:727:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1245:1245 -> a
-    727:727:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):91 -> a
+    692:696:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass):923:927 -> a
+    697:697:java.util.List lambda$groupMethodsByRenamedName$14(com.android.tools.r8.graph.DexString):926:926 -> a
+    698:703:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):934:939 -> a
+    704:712:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.DexCode):947:955 -> a
+    704:712:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):939 -> a
+    713:714:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):940:941 -> a
+    715:717:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):963:965 -> a
+    715:717:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):941 -> a
+    718:729:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1231:1242 -> a
+    718:729:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):90 -> a
+    730:730:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1234:1234 -> a
+    730:730:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):90 -> a
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> b
-    1:1:void lambda$run$1(java.lang.Object):519 -> b
-    2:2:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$7(com.android.tools.r8.graph.DexMethod):646:646 -> b
-    3:16:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):860:873 -> b
-    17:33:com.android.tools.r8.ir.code.Position getPositionFromPositionState(com.android.tools.r8.graph.DexDebugPositionState):1110:1126 -> b
-    34:48:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1263:1277 -> b
-    49:49:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1267:1267 -> b
+    1:1:void lambda$run$1(java.lang.Object):508 -> b
+    2:2:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$7(com.android.tools.r8.graph.DexMethod):635:635 -> b
+    3:16:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):849:862 -> b
+    17:33:com.android.tools.r8.ir.code.Position getPositionFromPositionState(com.android.tools.r8.graph.DexDebugPositionState):1099:1115 -> b
+    34:48:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1252:1266 -> b
+    49:49:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1256:1256 -> b
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> c
-    1:1:void lambda$run$2(java.lang.Object):527 -> c
+    1:1:void lambda$run$2(java.lang.Object):516 -> 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$3(java.lang.Object):631 -> d
+    1:1:void lambda$run$3(java.lang.Object):620 -> d
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> e
-    1:1:void lambda$run$8(java.lang.Object):715 -> e
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.FB:
+    1:1:void lambda$run$8(java.lang.Object):704 -> e
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.yB:
     java.util.List val$processedEvents -> o
     boolean $assertionsDisabled -> p
     int emittedPc -> j
@@ -123686,38 +123275,38 @@
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> l
     com.android.tools.r8.utils.Box val$inlinedOriginalPosition -> n
     java.util.List val$mappedPositions -> m
-    1:1:void <clinit>():1011:1011 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):1011:1014 -> <init>
-    1:3:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1018:1020 -> a
-    1:3:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):1068 -> a
-    4:4:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):1069:1069 -> a
-    5:7:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1018:1020 -> a
-    5:7:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):1074 -> a
-    8:8:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):1075:1075 -> a
-    9:11:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1018:1020 -> a
-    9:11:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):1062 -> a
-    12:12:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):1063:1063 -> a
-    13:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1027:1036 -> a
-    23:23:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):1045:1045 -> a
-    24:24:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):1050:1050 -> a
-    25:25:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):1055:1055 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.GB:
+    1:1:void <clinit>():1000:1000 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):1000:1003 -> <init>
+    1:3:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1007:1009 -> a
+    1:3:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):1057 -> a
+    4:4:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):1058:1058 -> a
+    5:7:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1007:1009 -> a
+    5:7:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):1063 -> a
+    8:8:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):1064:1064 -> a
+    9:11:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1007:1009 -> a
+    9:11:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):1051 -> a
+    12:12:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):1052:1052 -> a
+    13:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1016:1025 -> a
+    23:23:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):1034:1034 -> a
+    24:24:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):1039:1039 -> a
+    25:25:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):1044:1044 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.zB:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> l
     com.android.tools.r8.utils.BooleanBox val$singleOriginalLine -> k
     java.util.List val$mappedPositions -> m
     com.android.tools.r8.utils.Pair val$lastPosition -> j
-    1:1:void <clinit>():1146:1146 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1146:1146 -> <init>
-    1:12:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1149:1160 -> a
-    13:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1157:1166 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.HB:
+    1:1:void <clinit>():1135:1135 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1135:1135 -> <init>
+    1:12:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1138:1149 -> a
+    13:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1146:1155 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.AB:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():101:101 -> <clinit>
-    1:1:void <init>():101:101 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):101:101 -> <init>
-    1:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):106:107 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.IB:
+    1:1:void <clinit>():100:100 -> <clinit>
+    1:1:void <init>():100:100 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):100:100 -> <init>
+    1:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):105:106 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.BB:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
     java.util.Map parsedKotlinSourceDebugExtensions -> c
@@ -123726,25 +123315,25 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper baseRemapper -> e
     com.android.tools.r8.graph.DexEncodedMethod currentMethod -> f
-    1:1:void <clinit>():147:147 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):147:147 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):162:162 -> <init>
-    3:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):151:166 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod access$302(com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper,com.android.tools.r8.graph.DexEncodedMethod):147:147 -> a
-    2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):171:173 -> a
-    5:17:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):234:246 -> a
-    5:17:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):173 -> a
-    18:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):238:238 -> a
-    18:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):173 -> a
-    19:35:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):175:191 -> a
+    1:1:void <clinit>():146:146 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper,com.android.tools.r8.utils.LineNumberOptimizer$1):146:146 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):161:161 -> <init>
+    3:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.CfLineToMethodMapper):150:165 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod access$302(com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper,com.android.tools.r8.graph.DexEncodedMethod):146:146 -> a
+    2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):170:172 -> a
+    5:17:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):233:245 -> a
+    5:17:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):172 -> a
+    18:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):237:237 -> a
+    18:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):172 -> a
+    19:35:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):174:190 -> a
     36:38:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getName(java.lang.String):74:76 -> a
-    36:38:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):192 -> a
+    36:38:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):191 -> a
     39:41:java.lang.String com.android.tools.r8.utils.CfLineToMethodMapper.getDescriptor(java.lang.String):80:82 -> a
-    39:41:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):193 -> a
-    42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):194:204 -> a
-    53:75:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):201:223 -> a
-    76:88:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):218:230 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.JB:
+    39:41:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):192 -> a
+    42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):193:203 -> a
+    53:75:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):200:222 -> a
+    76:88:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):217:229 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.CB:
     boolean isOutline -> e
     com.android.tools.r8.graph.DexMethod outlineCallee -> f
     int obfuscatedLine -> d
@@ -123752,83 +123341,83 @@
     com.android.tools.r8.ir.code.Position caller -> c
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.utils.Int2StructuralItemArrayMap outlinePositions -> g
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.utils.LineNumberOptimizer$1):301:301 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap):318:325 -> <init>
-    1:1:boolean access$1000(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):301:301 -> a
-    2:2:boolean isOutlineCaller():329:329 -> a
-    1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):301:301 -> b
-    1:1:int access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):301:301 -> c
-    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):301:301 -> d
-    1:1:com.android.tools.r8.ir.code.Position access$700(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):301:301 -> e
-    1:1:com.android.tools.r8.graph.DexMethod access$800(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):301:301 -> f
-    1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap access$900(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):301:301 -> g
-com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport -> com.android.tools.r8.internal.KB:
-    1:1:void <init>():446:446 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):446:446 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap,com.android.tools.r8.utils.LineNumberOptimizer$1):300:300 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.ir.code.Position,int,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.Int2StructuralItemArrayMap):317:324 -> <init>
+    1:1:boolean access$1000(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> a
+    2:2:boolean isOutlineCaller():328:328 -> a
+    1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> b
+    1:1:int access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> c
+    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> d
+    1:1:com.android.tools.r8.ir.code.Position access$700(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> e
+    1:1:com.android.tools.r8.graph.DexMethod access$800(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> f
+    1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap access$900(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):300:300 -> g
+com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport -> com.android.tools.r8.internal.DB:
+    1:1:void <init>():438:438 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):438:438 -> <init>
     void updateDebugInfoInCodeObjects() -> a
-    1:1:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):457:457 -> a
-    2:2:void com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport.recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):457:457 -> a
-    2:2:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):462 -> a
-    1:1:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):451:451 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.LB:
+    1:1:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):449:449 -> a
+    2:2:void com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport.recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):449:449 -> a
+    2:2:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):454 -> a
+    1:1:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):443:443 -> b
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.EB:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
     int previousSourceLine -> c
     int maxLineDelta -> a
-    1:1:void <clinit>():111:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):117:117 -> <init>
-    2:10:void <init>(com.android.tools.r8.utils.InternalOptions):113:121 -> <init>
-    1:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):126:143 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder -> com.android.tools.r8.internal.MB:
+    1:1:void <clinit>():110:110 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):116:116 -> <init>
+    2:10:void <init>(com.android.tools.r8.utils.InternalOptions):112:120 -> <init>
+    1:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):125:142 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder -> com.android.tools.r8.internal.FB:
     java.util.List mappedOutlineCalleePositions -> b
     java.util.List mappedOutlinePositions -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1281:1281 -> <clinit>
-    1:6:void <init>():1281:1286 -> <init>
-    7:7:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):1281:1281 -> <init>
+    1:1:void <clinit>():1270:1270 -> <clinit>
+    1:6:void <init>():1270:1275 -> <init>
+    7:7:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):1270:1270 -> <init>
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
-    1:1:void lambda$fixup$1(java.lang.Object):1317 -> a
-    2:2:void setMappedPositionsOutline(java.util.List):1290:1290 -> a
-    3:3:void addMappedRangeForOutlineCallee(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):1295:1295 -> a
-    4:12:void fixup():1299:1307 -> a
+    1:1:void lambda$fixup$1(java.lang.Object):1306 -> a
+    2:2:void setMappedPositionsOutline(java.util.List):1279:1279 -> a
+    3:3:void addMappedRangeForOutlineCallee(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):1284:1284 -> a
+    4:12:void fixup():1288:1296 -> a
     13:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.<init>():176:176 -> a
-    13:13:void fixup():1307 -> a
-    14:23:void fixup():1308:1317 -> a
-    24:24:void fixup():1316:1316 -> a
-    25:26:void fixup():1300:1301 -> a
-    27:27:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1311:1311 -> a
-    28:30:int com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder.getMinifiedLinePosition(int,java.util.List):1323:1325 -> a
-    28:30:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1311 -> a
-    31:31:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1313:1313 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport -> com.android.tools.r8.internal.NB:
+    13:13:void fixup():1296 -> a
+    14:23:void fixup():1297:1306 -> a
+    24:24:void fixup():1305:1305 -> a
+    25:26:void fixup():1289:1290 -> a
+    27:27:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1300:1300 -> a
+    28:30:int com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder.getMinifiedLinePosition(int,java.util.List):1312:1314 -> a
+    28:30:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1300 -> a
+    31:31:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1302:1302 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport -> com.android.tools.r8.internal.GB:
     java.util.List codesToUpdate -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap paramToMaxPc -> a
     java.util.List singleLineCodesToClear -> c
-    1:1:void <init>(boolean):390:390 -> <init>
-    2:11:void <init>(boolean):382:391 -> <init>
-    1:6:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):405:410 -> a
-    7:11:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):415:419 -> a
-    12:13:void updateDebugInfoInCodeObjects():424:425 -> a
+    1:1:void <init>(boolean):382:382 -> <init>
+    2:11:void <init>(boolean):374:383 -> <init>
+    1:6:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):397:402 -> a
+    7:11:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):407:411 -> a
+    12:13:void updateDebugInfoInCodeObjects():416:417 -> a
     14:14:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
-    14:14:void updateDebugInfoInCodeObjects():425 -> a
-    15:26:void updateDebugInfoInCodeObjects():426:437 -> a
-    27:31:void lambda$updateDebugInfoInCodeObjects$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.Pair):428:432 -> a
-    32:35:void lambda$updateDebugInfoInCodeObjects$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.Pair):431:434 -> a
-    36:36:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):433:433 -> a
+    14:14:void updateDebugInfoInCodeObjects():417 -> a
+    15:26:void updateDebugInfoInCodeObjects():418:429 -> a
+    27:31:void lambda$updateDebugInfoInCodeObjects$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.Pair):420:424 -> a
+    32:35:void lambda$updateDebugInfoInCodeObjects$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.Pair):423:426 -> a
+    36:36:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):425:425 -> a
     37:38:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):120:121 -> a
-    37:38:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):433 -> a
-    39:39:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):433:433 -> a
-    40:40:com.android.tools.r8.graph.DexDebugInfo com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport.buildPc2PcDebugInfo(int,int):442:442 -> a
-    40:40:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):433 -> a
-    41:41:void lambda$updateDebugInfoInCodeObjects$2(com.android.tools.r8.graph.DexCode):437:437 -> a
-    1:4:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):396:399 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder -> com.android.tools.r8.internal.OB:
+    37:38:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):425 -> a
+    39:39:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):425:425 -> a
+    40:40:com.android.tools.r8.graph.DexDebugInfo com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport.buildPc2PcDebugInfo(int,int):434:434 -> a
+    40:40:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):425 -> a
+    41:41:void lambda$updateDebugInfoInCodeObjects$2(com.android.tools.r8.graph.DexCode):429:429 -> a
+    1:4:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):388:391 -> b
+com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder -> com.android.tools.r8.internal.HB:
     void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int) -> a
     void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int) -> a
     void updateDebugInfoInCodeObjects() -> a
     void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int) -> b
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.PB:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.IB:
     java.util.List processedEvents -> f
     int previousPc -> d
     boolean $assertionsDisabled -> g
@@ -123836,33 +123425,33 @@
     com.android.tools.r8.graph.DexMethod method -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     com.android.tools.r8.ir.code.Position previousPosition -> e
-    1:1:void <clinit>():257:257 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.utils.LineNumberOptimizer$1):257:257 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):266:266 -> <init>
-    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):259:269 -> <init>
-    1:1:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitAdvancePc(int):273:273 -> a
-    1:1:void access$1200(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):257 -> a
+    1:1:void <clinit>():256:256 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.utils.LineNumberOptimizer$1):256:256 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):265:265 -> <init>
+    3:13:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,java.util.List):258:268 -> <init>
+    1:1:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitAdvancePc(int):272:272 -> a
+    1:1:void access$1200(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):256 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:3:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitAdvancePc(int):273:274 -> a
-    2:3:void access$1200(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):257 -> a
-    4:4:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitPositionEvents(int,com.android.tools.r8.ir.code.Position):278:278 -> a
-    4:4:void access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):257 -> a
+    2:3:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitAdvancePc(int):272:273 -> a
+    2:3:void access$1200(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int):256 -> a
+    4:4:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitPositionEvents(int,com.android.tools.r8.ir.code.Position):277:277 -> a
+    4:4:void access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):256 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:17:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitPositionEvents(int,com.android.tools.r8.ir.code.Position):279:291 -> a
-    5:17:void access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):257 -> a
-    18:18:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():295:295 -> a
-    18:18:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):257 -> a
-    19:19:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():295:295 -> a
-    19:19:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):257 -> a
+    5:17:void com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.emitPositionEvents(int,com.android.tools.r8.ir.code.Position):278:290 -> a
+    5:17:void access$1500(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):256 -> a
+    18:18:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():294:294 -> a
+    18:18:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):256 -> a
+    19:19:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():294:294 -> a
+    19:19:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):256 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():295:295 -> a
-    20:20:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):257 -> a
-    21:21:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():296:296 -> a
-    21:21:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):257 -> a
+    20:20:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():294:294 -> a
+    20:20:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):256 -> a
+    21:21:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():295:295 -> a
+    21:21:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):256 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.QB:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.JB:
     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.dC:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.WB:
     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:5:java.util.List filter(java.util.Collection,java.util.function.Predicate):58:59 -> a
@@ -123886,8 +123475,8 @@
     1:2:int firstIndexMatching(java.util.List,java.util.function.Predicate):78:79 -> c
     1:2:int lastIndexMatching(java.util.List,java.util.function.Predicate):91:92 -> d
     1:3:int uniqueIndexMatching(java.util.List,java.util.function.Predicate):284:286 -> e
-com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.cC:
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.QC:
+com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.VB:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.JC:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -123908,7 +123497,7 @@
     77:77:java.lang.String toString():74:74 -> toString
     78:78:java.lang.String toString():74:74 -> toString
     75:75:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.nD:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.gD:
     1:1:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41,"3":42}}
@@ -123944,7 +123533,7 @@
     76:76:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     76:76:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     77:77:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.iD:
     java.util.Map HANDLERS -> c
     java.lang.String template -> a
     java.lang.String cachedValue -> b
@@ -123969,7 +123558,7 @@
     57:63:com.android.tools.r8.MapIdProvider create(java.lang.String,com.android.tools.r8.DiagnosticsHandler):45:51 -> a
     69:69:void lambda$get$0(com.android.tools.r8.MapIdEnvironment,java.lang.String,com.android.tools.r8.MapIdProvider):67:67 -> a
     1:8:java.lang.String get(com.android.tools.r8.MapIdEnvironment):63:70 -> get
-com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.sD:
+com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.lD:
     1:1:java.util.Map clone(java.util.Map,java.util.Map,java.util.function.Function):26:26 -> a
     2:2:void lambda$clone$0(java.util.Map,java.util.function.Function,java.lang.Object,java.lang.Object):26:26 -> a
     3:3:java.util.function.Function ignoreKey(java.util.function.Supplier):39:39 -> a
@@ -123987,7 +123576,7 @@
     2:2:java.lang.String toString(java.util.Map):58:58 -> b
     3:3:java.lang.String toString(java.util.Map):57:57 -> b
     4:4:java.lang.Object lambda$transform$6(java.util.function.Function,java.lang.Object,java.lang.Object):71:71 -> b
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.AE:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.tE:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -124001,7 +123590,7 @@
     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.PE:
+com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.IE:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():24:24 -> <clinit>
@@ -124047,7 +123636,7 @@
     22:22:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
     22:22:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):52 -> b
     23:23: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.RE:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.KE:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -124058,10 +123647,10 @@
     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.ObjectUtils -> com.android.tools.r8.internal.nK:
+com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.dK:
     1:1:boolean getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):14:14 -> a
     2:2:java.lang.Object mapNotNullOrDefault(java.lang.Object,java.lang.Object,java.util.function.Function):31:31 -> a
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.sK:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.iK:
     com.android.tools.r8.utils.OffOrAuto Auto -> c
     com.android.tools.r8.utils.OffOrAuto Off -> b
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> d
@@ -124083,7 +123672,7 @@
     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.IK:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.yK:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> c
     com.android.tools.r8.utils.OptionalBool TRUE -> a
     com.android.tools.r8.utils.OptionalBool FALSE -> b
@@ -124092,22 +123681,22 @@
     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.FK:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.vK:
     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.GK:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.wK:
     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.HK:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.xK:
     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.LK:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.BK:
     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
@@ -124121,14 +123710,14 @@
     96:96:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):65:65 -> a
     91:93:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):65: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.KK:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.AK:
     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.QK:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.GK:
     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>
@@ -124136,7 +123725,7 @@
     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.OriginalSourceFiles -> com.android.tools.r8.internal.UK:
+com.android.tools.r8.utils.OriginalSourceFiles -> com.android.tools.r8.internal.KK:
     com.android.tools.r8.utils.OriginalSourceFiles UNREACHABLE -> a
     com.android.tools.r8.utils.OriginalSourceFiles FROM_CLASSES -> b
     1:9:void <clinit>():15:23 -> <clinit>
@@ -124145,17 +123734,17 @@
     1:1:com.android.tools.r8.utils.OriginalSourceFiles fromClasses():38:38 -> a
     2:2:com.android.tools.r8.utils.OriginalSourceFiles fromMap(java.util.Map):43:43 -> a
     1:1:com.android.tools.r8.utils.OriginalSourceFiles unreachable():33:33 -> b
-com.android.tools.r8.utils.OriginalSourceFiles$1 -> com.android.tools.r8.internal.RK:
+com.android.tools.r8.utils.OriginalSourceFiles$1 -> com.android.tools.r8.internal.HK:
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):19:19 -> a
-com.android.tools.r8.utils.OriginalSourceFiles$2 -> com.android.tools.r8.internal.SK:
+com.android.tools.r8.utils.OriginalSourceFiles$2 -> com.android.tools.r8.internal.IK:
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
-com.android.tools.r8.utils.OriginalSourceFiles$3 -> com.android.tools.r8.internal.TK:
+com.android.tools.r8.utils.OriginalSourceFiles$3 -> com.android.tools.r8.internal.JK:
     java.util.Map val$map -> c
     1:1:void <init>(java.util.Map):43:43 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.rL:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.hL:
 # {"id":"sourceFile","fileName":"Pair.java"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -124174,7 +123763,7 @@
     59:59:java.lang.String toString():56:56 -> toString
     60:60:java.lang.String toString():56:56 -> toString
     57:57:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.cM:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.SL:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -124183,13 +123772,13 @@
     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.dM:
+com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.TL:
     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.mM:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.cM:
     java.util.Map content -> b
     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>
@@ -124208,7 +123797,7 @@
     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$Builder -> com.android.tools.r8.internal.mM$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.cM$a:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -124217,11 +123806,11 @@
     3:3:void <init>():76:76 -> <init>
     1:5:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder addResource(java.lang.String,byte[]):82:86 -> a
     6:8:com.android.tools.r8.utils.PreloadedClassFileProvider build():91:93 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.nM:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.dM:
     java.lang.String descriptor -> f
     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.KM:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.AM:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -124280,14 +123869,14 @@
     35:35:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
     36:36:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
     36:36:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):68 -> a
-    1:1:com.android.tools.r8.graph.ClassKind getClassKind():57:57 -> e
+    1:1:com.android.tools.r8.graph.ClassKind getClassKind():57:57 -> c
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":44,"2":45,"3":46}}
     44:44:java.lang.String toString():42:42 -> toString
     45:45:java.lang.String toString():42:42 -> toString
     46:46:java.lang.String toString():42:42 -> toString
     43:43:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.UM:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.KM:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -124298,16 +123887,16 @@
     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.UR:
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.PR:
+com.android.tools.r8.utils.ReflectionHelper -> com.android.tools.r8.internal.JR:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.ER:
     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.QR:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveMethodOperation -> com.android.tools.r8.internal.FR:
     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.RR:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.tools.r8.internal.GR:
     java.util.function.Consumer modifier -> c
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation nextOperation -> d
     java.lang.Class classForDeclaration -> a
@@ -124315,7 +123904,7 @@
     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.SR:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.android.tools.r8.internal.HR:
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder sequenceBuilder -> d
     boolean $assertionsDisabled -> e
     java.lang.String declaredMember -> a
@@ -124331,7 +123920,7 @@
     16:17:void lambda$build$0(java.lang.reflect.Field):153:154 -> a
     18:19:void lambda$build$1(java.lang.reflect.Method):164:165 -> a
     1:1:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder setSetAccessible(boolean):138:138 -> b
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.TR:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.IR:
     java.util.List reflectiveOperationBuilderList -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():92:92 -> <clinit>
@@ -124342,7 +123931,7 @@
     1:1:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readMethod(java.lang.String):0:0 -> b
     2:4: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
     2:4:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readMethod(java.lang.String):97 -> b
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.FS:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.vS:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -124364,19 +123953,19 @@
     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.CS:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.sS:
     1:1:void <init>():56:56 -> <init>
-com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.DS:
+com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.tS:
     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.ES:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.uS:
     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.YT:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.OT:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -124389,7 +123978,7 @@
     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.ZT:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.PT:
     int minor -> b
     int patch -> c
     int major -> a
@@ -124434,7 +124023,7 @@
     85:85:java.lang.String toString():82:82 -> toString
     86:86:java.lang.String toString():82:82 -> toString
     83:83:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.dU:
+com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.TT:
     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.HashSet newHashSet(java.lang.Object[]):39:40 -> a
@@ -124447,14 +124036,14 @@
     1:1:java.util.Set newIdentityHashSet(int):85:85 -> b
     2:4:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):95:97 -> b
     5:11:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSetExcludingNullItems(java.lang.Object[]):102:108 -> b
-com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.pV:
+com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.fV:
     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.SourceFileTemplateProvider -> com.android.tools.r8.internal.tV:
+com.android.tools.r8.utils.SourceFileTemplateProvider -> com.android.tools.r8.internal.jV:
     java.util.Map HANDLERS -> c
     java.lang.String template -> a
     java.lang.String cachedValue -> b
@@ -124482,7 +124071,7 @@
     58:64:com.android.tools.r8.SourceFileProvider create(java.lang.String,com.android.tools.r8.DiagnosticsHandler):46:52 -> a
     70:70:void lambda$get$0(com.android.tools.r8.SourceFileEnvironment,java.lang.String,com.android.tools.r8.SourceFileProvider):68:68 -> a
     1:8:java.lang.String get(com.android.tools.r8.SourceFileEnvironment):64:71 -> get
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.tW:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.jW:
     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 -> b
@@ -124496,7 +124085,7 @@
     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.bX:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.RW:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -124537,61 +124126,61 @@
     53:57:java.lang.String lines(java.util.List):151:155 -> a
     58:58:java.lang.String joinLines(java.lang.String[]):173:173 -> a
     59:59:java.lang.String joinLines(java.util.Collection):177:177 -> a
-    60:67:java.lang.String zeroPrefixString(java.lang.String,int):209:216 -> a
-    68:68:java.lang.String hexString(int,int):223:223 -> a
-    69:71:java.lang.String hexString(int,int,boolean):227:229 -> a
-    72:72:java.lang.String hexString(int,int,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":538,"2":539,"3":540}}
-    538:538:java.lang.String hexString(int,int,boolean):231:231 -> a
-    539:539:java.lang.String hexString(int,int,boolean):231:231 -> a
-    540:540:java.lang.String hexString(int,int,boolean):231:231 -> a
-    303:306:java.lang.String hexString(int,int,boolean):231:234 -> a
-    307:307:java.lang.String hexString(int,int,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":544,"2":545,"3":546,"4":547,"5":548}}
-    544:544:java.lang.String hexString(int,int,boolean):235:235 -> a
-    545:545:java.lang.String hexString(int,int,boolean):235:235 -> a
-    546:546:java.lang.String hexString(int,int,boolean):235:235 -> a
-    547:547:java.lang.String hexString(int,int,boolean):235:235 -> a
-    548:548:java.lang.String hexString(int,int,boolean):235:235 -> a
-    549:551:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):244:246 -> a
-    549:551:java.lang.String hexString(long,int):240 -> a
-    552:552:java.lang.String hexString(long,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":558,"2":559,"3":560}}
-    558:558:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):248:248 -> a
+    60:60:java.lang.String hexString(int,int):223:223 -> a
+    61:63:java.lang.String hexString(int,int,boolean):227:229 -> a
+    64:64:java.lang.String hexString(int,int,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":530,"2":531,"3":532}}
+    530:530:java.lang.String hexString(int,int,boolean):231:231 -> a
+    531:531:java.lang.String hexString(int,int,boolean):231:231 -> a
+    532:532:java.lang.String hexString(int,int,boolean):231:231 -> a
+    295:298:java.lang.String hexString(int,int,boolean):231:234 -> a
+    299:299:java.lang.String hexString(int,int,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":536,"2":537,"3":538,"4":539,"5":540}}
+    536:536:java.lang.String hexString(int,int,boolean):235:235 -> a
+    537:537:java.lang.String hexString(int,int,boolean):235:235 -> a
+    538:538:java.lang.String hexString(int,int,boolean):235:235 -> a
+    539:539:java.lang.String hexString(int,int,boolean):235:235 -> a
+    540:540:java.lang.String hexString(int,int,boolean):235:235 -> a
+    541:543:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):244:246 -> a
+    541:543:java.lang.String hexString(long,int):240 -> a
+    544:544:java.lang.String hexString(long,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":550,"2":551,"3":552}}
+    550:550:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):248:248 -> a
+    550:550:java.lang.String hexString(long,int):240 -> a
+    551:551:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):248:248 -> a
+    551:551:java.lang.String hexString(long,int):240 -> a
+    552:552:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):248:248 -> a
+    552:552:java.lang.String hexString(long,int):240 -> a
+    545:548:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):248:251 -> a
+    545:548:java.lang.String hexString(long,int):240 -> a
+    549:549:java.lang.String hexString(long,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":556,"2":557,"3":558,"4":559,"5":560}}
+    556:556:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
+    556:556:java.lang.String hexString(long,int):240 -> a
+    557:557:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
+    557:557:java.lang.String hexString(long,int):240 -> a
+    558:558:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
     558:558:java.lang.String hexString(long,int):240 -> a
-    559:559:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):248:248 -> a
+    559:559:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
     559:559:java.lang.String hexString(long,int):240 -> a
-    560:560:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):248:248 -> a
+    560:560:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
     560:560:java.lang.String hexString(long,int):240 -> a
-    553:556:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):248:251 -> a
-    553:556:java.lang.String hexString(long,int):240 -> a
-    557:557:java.lang.String hexString(long,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":564,"2":565,"3":566,"4":567,"5":568}}
-    564:564:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
-    564:564:java.lang.String hexString(long,int):240 -> a
-    565:565:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
-    565:565:java.lang.String hexString(long,int):240 -> a
-    566:566:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
-    566:566:java.lang.String hexString(long,int):240 -> a
-    567:567:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
-    567:567:java.lang.String hexString(long,int):240 -> a
-    568:568:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):252:252 -> a
-    568:568:java.lang.String hexString(long,int):240 -> a
-    569:573:java.lang.String times(java.lang.String,int):271:275 -> a
-    574:574:boolean isWhitespace(int):283:283 -> a
-    575:575:java.lang.String replaceAll(java.lang.String,java.lang.String,java.lang.String):340:340 -> a
-    576:579:java.lang.String capitalize(java.lang.String):350:353 -> a
+    561:565:java.lang.String times(java.lang.String,int):271:275 -> a
+    566:566:boolean isWhitespace(int):283:283 -> a
+    567:567:java.lang.String replaceAll(java.lang.String,java.lang.String,java.lang.String):340:340 -> a
+    568:571:java.lang.String capitalize(java.lang.String):350:353 -> a
     1:1:java.lang.String lines(java.lang.String[]):159:159 -> b
     2:19:java.util.List splitLines(java.lang.String):181:198 -> b
     20:20:java.lang.String zeroPrefix(int,int):205:205 -> b
+    21:28:java.lang.String zeroPrefixString(java.lang.String,int):209:216 -> b
     1:2:java.lang.String stripLeadingBOM(java.lang.String):287:288 -> c
     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.aX:
+com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.QW:
     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.bX$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.RW$a:
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> b
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> c
     com.android.tools.r8.utils.StringUtils$BraceType[] $VALUES -> f
@@ -124601,10 +124190,10 @@
     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.uX:
+com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.kX:
     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.FX:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.vX:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -124617,7 +124206,7 @@
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String com.android.tools.r8.utils.SymbolGenerationUtils.numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.FX$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.vX$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> c
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> b
     1:2:void <clinit>():16:17 -> <clinit>
@@ -124662,33 +124251,33 @@
     2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):188:188 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):195:195 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):189 -> b
-com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.dY:
+com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.TX:
     void execute() -> a
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.eY:
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.fY:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.gY:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.UX:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.VX:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.WX:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.hY:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.XX:
     1:7:void acceptWithRuntimeException(java.lang.Object):20:26 -> a
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.iY:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.kY:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.YX:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.aY:
     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.lY:
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.mY:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.bY:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.cY:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:6:java.util.List take(int):25:30 -> a
     7:7:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.nY:
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.oY:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.dY:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.eY:
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.pY:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.AY:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.fY:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.qY:
     java.util.Stack stack -> b
     com.android.tools.r8.utils.Timing EMPTY -> d
     boolean $assertionsDisabled -> e
@@ -124776,21 +124365,21 @@
     5:9:void com.android.tools.r8.utils.Timing$Node.end():147:151 -> d
     5:9:void report():405 -> d
     10:11:void report():406:407 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.tY:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.jY:
     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
     2:2:java.lang.Object scope(java.lang.String,com.android.tools.r8.utils.Timing$TimingScope):63:63 -> a
     void end() -> c
     void report() -> d
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.sY:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.iY:
     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.uY:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.kY:
     long used -> a
     1:2:void <init>(long):106:107 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.vY:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.lY:
     java.util.Map children -> c
     long start_time -> e
     java.lang.String title -> a
@@ -124873,7 +124462,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> toString
     4:4:java.lang.String toString():161 -> toString
     5:5:java.lang.String toString():161:161 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.yY:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.oY:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Timing$Node slowest -> d
     int taskCount -> c
@@ -124889,7 +124478,7 @@
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):310:310 -> a
     25:26:void end():320:321 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):230:230 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.wY:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.mY:
     boolean $assertionsDisabled -> k
     int val$numberOfThreads -> i
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
@@ -124948,26 +124537,26 @@
     278:278:java.lang.String toString():275:275 -> toString
     279:279:java.lang.String toString():275:275 -> toString
     276:276:java.lang.String toString():275:275 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.xY:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.nY:
     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):284:286 -> <init>
-com.android.tools.r8.utils.Timing$TimingScope -> com.android.tools.r8.internal.zY:
+com.android.tools.r8.utils.Timing$TimingScope -> com.android.tools.r8.internal.pY:
     java.lang.Object apply() -> a
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.SY:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.IY:
     com.android.tools.r8.utils.TraversalContinuation BREAK -> c
     com.android.tools.r8.utils.TraversalContinuation CONTINUE -> b
     1:2:void <clinit>():9:10 -> <clinit>
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:boolean shouldBreak():21:21 -> a
     1:1:boolean shouldContinue():25:25 -> b
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.XY:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.NY:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.YY:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.OY:
     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.ZY:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.PY:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.f00:
+com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.VZ:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():19:21 -> <clinit>
@@ -124980,19 +124569,19 @@
     6:7:com.android.tools.r8.graph.DexProto toDexProto(java.util.List,com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):61:62 -> a
     8:8:com.android.tools.r8.graph.DexProto toDexProto(java.util.List,com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):60:60 -> a
     9:9:com.android.tools.r8.graph.DexType lambda$toDexProto$2(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.references.TypeReference):64:64 -> a
-    1:23:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):85:107 -> b
-    24:24:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":184,"2":185,"3":186}}
-    184:184:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):107:107 -> b
-    185:185:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):107:107 -> b
-    186:186:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):107:107 -> b
-    132:132:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):108:108 -> b
-    133:145:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):91:103 -> b
-    146:152:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):99:105 -> b
-    153:153: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 -> b
-    154:177: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 -> b
-    178:183: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 -> b
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.x10:
+    10:32:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):85:107 -> a
+    33:33:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":193,"2":194,"3":195}}
+    193:193:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):107:107 -> a
+    194:194:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):107:107 -> a
+    195:195:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):107:107 -> a
+    141:141:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):108:108 -> a
+    142:154:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):91:103 -> a
+    155:161:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):99:105 -> a
+    162:162: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
+    163:186: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
+    187:192: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.n10:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -125012,15 +124601,15 @@
     111:111:java.lang.String getDescription():53:53 -> a
     54:54:java.lang.String getDescription():53:53 -> a
     55:55:java.lang.String getDescription():0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":112,"2":113,"3":114}}
-    112:112:java.lang.String getDescription():53:53 -> a
-    113:113:java.lang.String getDescription():53:53 -> a
-    114:114:java.lang.String getDescription():53:53 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109,"2":110,"3":111}}
+    109:109:java.lang.String getDescription():53:53 -> a
+    110:110:java.lang.String getDescription():53:53 -> a
+    111:111:java.lang.String getDescription():53:53 -> a
     108:108:java.lang.String getDescription():53:53 -> a
     1:1: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.i20:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.Y10:
     com.android.tools.r8.utils.Visibility PACKAGE_PRIVATE -> e
     com.android.tools.r8.utils.Visibility[] $VALUES -> f
     com.android.tools.r8.utils.Visibility PUBLIC -> b
@@ -125035,10 +124624,10 @@
     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.h20:
+com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.X10:
     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.A20:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.q20:
     java.util.Deque workingList -> a
     java.util.Set seen -> b
     boolean $assertionsDisabled -> c
@@ -125137,10 +124726,10 @@
     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.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.JE:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.CE:
     1:31:com.android.tools.r8.utils.collections.ProgramMethodSet findAllMethodsAndOverridesThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.function.Predicate):36:66 -> a
     32:36:void lambda$findAllMethodsAndOverridesThatMatches$0(java.util.function.Predicate,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):42:46 -> a
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.HE:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.AE:
     com.android.tools.r8.utils.collections.ProgramMethodSet classRootMethods -> f
     java.util.Map interfaceMethodsOfInterest -> g
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):81:81 -> <init>
@@ -125160,7 +124749,7 @@
     21:21:com.android.tools.r8.graph.MethodResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethodOnClass(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexClass):784:784 -> k
     21:21:void visit(com.android.tools.r8.graph.DexProgramClass):114 -> k
     22:33:void visit(com.android.tools.r8.graph.DexProgramClass):115:126 -> k
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.IE:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.BE:
     com.android.tools.r8.utils.collections.ProgramMethodSet result -> g
     java.util.Map methodsOfInterest -> f
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):164:164 -> <init>
@@ -125179,12 +124768,12 @@
     7:7:void visit(com.android.tools.r8.graph.DexProgramClass):185 -> k
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:void visit(com.android.tools.r8.graph.DexProgramClass):190:190 -> k
-com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.O4:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.N4:
     java.util.Set getKeys(java.lang.Object) -> c
-com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.P4:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.O4:
     java.lang.Object getRepresentativeValue(java.lang.Object) -> a
     java.lang.Object getRepresentativeKey(java.lang.Object) -> b
-com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.Q4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.P4:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     boolean $assertionsDisabled -> d
@@ -125212,10 +124801,10 @@
     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.R4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.Q4:
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     java.util.Map getForwardMap() -> f
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.S4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.R4:
     boolean $assertionsDisabled -> f
     java.util.Map representatives -> e
     1:1:void <clinit>():13:13 -> <clinit>
@@ -125244,8 +124833,8 @@
     4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):44:44 -> e
     4:4:java.lang.Object remove(java.lang.Object):99 -> e
     1:1:boolean hasExplicitRepresentativeKey(java.lang.Object):54:54 -> f
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.T4:
-com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.U4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.S4:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.T4:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     1:1:void <init>():21:21 -> <init>
@@ -125263,7 +124852,7 @@
     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.V4:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.U4:
     java.util.Map representatives -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():12:12 -> <clinit>
@@ -125274,7 +124863,7 @@
     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.W4:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.V4:
     com.android.tools.r8.com.google.common.collect.BiMap backing -> b
     1:1:void <init>():22:22 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.BiMap):25:26 -> <init>
@@ -125312,14 +124901,14 @@
     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.X4:
-com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.sg:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.W4:
+com.android.tools.r8.utils.collections.DexClassAndMethodSet -> com.android.tools.r8.internal.ng:
     com.android.tools.r8.utils.collections.DexClassAndMethodSet EMPTY -> e
     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.tg:
+com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.og:
     java.util.function.Supplier backingFactory -> c
     java.util.Map backing -> b
     boolean $assertionsDisabled -> d
@@ -125347,7 +124936,7 @@
     1:1:java.util.Iterator iterator():75:75 -> iterator
     1:1:int size():92:92 -> size
     1:1:java.util.stream.Stream stream():96:96 -> stream
-com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.ah:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.Vg:
     com.android.tools.r8.utils.collections.DexMethodSignatureSet EMPTY -> c
     java.util.Set backing -> b
     1:2:void <clinit>():23:24 -> <clinit>
@@ -125399,7 +124988,7 @@
     1:1:int size():167:167 -> size
     1:1:java.lang.Object[] toArray():172:172 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):177:177 -> toArray
-com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.Mh:
+com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.Hh:
     1:1:void <init>():15:15 -> <init>
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     java.lang.Object getRepresentativeValue(java.lang.Object) -> a
@@ -125409,7 +124998,7 @@
     1:1:java.util.Map getForwardMap():15 -> f
     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.Mn:
+com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.In:
     java.util.Map backing -> b
     java.util.function.Function valueToKeyMapping -> c
     1:1:void <init>(java.util.function.Function):21:21 -> <init>
@@ -125429,7 +125018,7 @@
     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.Wn:
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Sn:
     boolean isClosed -> b
     1:1:void <init>(java.util.Collection):20:20 -> <init>
     2:2:void <init>(java.util.Collection):17:17 -> <init>
@@ -125453,7 +125042,7 @@
     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.bo:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.Xn:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> c
     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>
@@ -125523,12 +125112,12 @@
     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$Builder -> com.android.tools.r8.internal.ao:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.Wn:
     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.LongLivedClassSetBuilder -> com.android.tools.r8.internal.TC:
+com.android.tools.r8.utils.collections.LongLivedClassSetBuilder -> com.android.tools.r8.internal.MC:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):23:23 -> <init>
@@ -125549,7 +125138,7 @@
     87:87:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
     88:88:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
     85:85:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
-com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.UC:
+com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.NC:
     java.util.function.IntFunction factoryForBuilder -> b
     java.lang.Object backing -> d
     boolean $assertionsDisabled -> e
@@ -125557,7 +125146,7 @@
     com.android.tools.r8.graph.GraphLens appliedGraphLens -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):27:31 -> <init>
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.VC:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.OC:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):30:30 -> <init>
@@ -125584,7 +125173,7 @@
     32:32:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):92 -> a
     33:34:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):94:95 -> a
     35:40:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.function.Function,com.android.tools.r8.graph.DexMethod,java.lang.Object):97:102 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.WC:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.PC:
     java.util.function.IntFunction factoryForBuilder -> b
     java.util.Set methods -> d
     boolean $assertionsDisabled -> e
@@ -125638,11 +125227,11 @@
     1:13:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder rewrittenWithLens(com.android.tools.r8.graph.GraphLens):143:155 -> c
     1:4:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):180:183 -> d
     5:5:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):182:182 -> d
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.fG:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.YF:
     void put(java.lang.Iterable,java.lang.Object) -> a
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.gG:
-com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.hG:
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.RM:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.ZF:
+com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.aG:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.HM:
     java.util.Map backing -> b
     com.android.tools.r8.utils.collections.ProgramFieldSet EMPTY -> c
     boolean $assertionsDisabled -> d
@@ -125656,7 +125245,7 @@
     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.TM:
+com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.internal.JM:
     java.util.Map backing -> a
     1:2:void <init>(java.util.function.Supplier):20:21 -> <init>
     3:4:void <init>(java.util.Map):24:25 -> <init>
@@ -125675,7 +125264,7 @@
     15:15:void removeIf(java.util.function.BiPredicate):75:75 -> a
     1:1:java.lang.Object get(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.VM:
+com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.LM:
     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>
@@ -125687,7 +125276,7 @@
     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 createConcurrent():37:37 -> c
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMap empty():42:42 -> d
-com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.WM:
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.MM:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):22:23 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMultiset createConcurrent():27:27 -> a
@@ -125700,7 +125289,7 @@
     7:7:boolean lambda$removeIf$1(java.util.function.Predicate,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):47:47 -> a
     8:8:boolean removeIf(java.util.function.Predicate):47:47 -> a
     1:1:int size():51:51 -> b
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.XM:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.NM:
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> e
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):26:26 -> <init>
@@ -125728,7 +125317,7 @@
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet createLinked():66:66 -> d
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet empty():70:70 -> e
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):40:40 -> h
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.mV:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.cV:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):29:29 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):23:23 -> a
@@ -125750,7 +125339,7 @@
     1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():33:33 -> f
     1:1:java.util.SortedMap lambda$create$1():44:44 -> g
     1:1:java.util.SortedMap lambda$static$0():26:26 -> h
-com.android.tools.r8.utils.dfs.DFSStack -> com.android.tools.r8.internal.ie:
+com.android.tools.r8.utils.dfs.DFSStack -> com.android.tools.r8.internal.he:
     java.util.Deque stack -> a
     java.util.Set stackSet -> b
     boolean $assertionsDisabled -> c
@@ -125776,21 +125365,21 @@
     1:5:java.util.Deque getCycleStartingAt(java.lang.Object):32:36 -> b
     6:8:void com.android.tools.r8.utils.dfs.DFSStack.recoverStack(java.util.Deque):64:66 -> b
     6:8:java.util.Deque getCycleStartingAt(java.lang.Object):37 -> b
-com.android.tools.r8.utils.dfs.DFSWorklistItem -> com.android.tools.r8.internal.le:
+com.android.tools.r8.utils.dfs.DFSWorklistItem -> com.android.tools.r8.internal.ke:
     java.lang.Object value -> a
     1:2:void <init>(java.lang.Object):11:12 -> <init>
     com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem asNewlyVisited() -> a
     1:1:java.lang.Object getValue():16:16 -> b
-com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem -> com.android.tools.r8.internal.je:
+com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem -> com.android.tools.r8.internal.ie:
     1:1:void <init>(java.lang.Object):55:55 -> <init>
-com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem -> com.android.tools.r8.internal.ke:
+com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem -> com.android.tools.r8.internal.je:
     1:1:void <init>(java.lang.Object):34:34 -> <init>
     com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem asNewlyVisited() -> a
     1:1:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48:48 -> c
     2:2:java.lang.Object com.android.tools.r8.utils.dfs.DFSWorklistItem.getValue():16:16 -> c
     2:2:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48 -> c
     3:3:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48:48 -> c
-com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.mc:
+com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.lc:
     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
@@ -125805,7 +125394,7 @@
     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.oc:
+com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.nc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -125826,7 +125415,7 @@
     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$ItemSpecification -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.mc:
     com.android.tools.r8.utils.structural.CompareToVisitorBase parent -> a
     java.lang.Object item1 -> b
     boolean $assertionsDisabled -> e
@@ -125896,7 +125485,7 @@
     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.pc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.oc:
     com.android.tools.r8.naming.NamingLens namingLens -> b
     1:2:void <init>(com.android.tools.r8.naming.NamingLens):29:30 -> <init>
     1:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):38:41 -> a
@@ -125918,40 +125507,40 @@
     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):69 -> a
     16:16:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):73:73 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.qc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.pc:
     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):25:25 -> 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):25 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.rc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.qc:
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:2:void <init>(com.android.tools.r8.utils.structural.RepresentativeMap):26:27 -> <init>
     1:3:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):35:37 -> 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):37 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.sc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.rc:
     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):28:28 -> 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):28 -> a
-com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.Ne:
+com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.Ie:
     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):20:21 -> 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.Pe:
+com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.Ke:
     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.utils.structural.HasherWrapper,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):21:21 -> a
-com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Zi:
+com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Ui:
     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.Yi:
+com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.Ti:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
-com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.Bm:
+com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.wm:
     int $r8$clinit -> d
     java.lang.Object item -> a
     int hashCode -> b
@@ -125980,7 +125569,7 @@
     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.HasherWrapper -> com.android.tools.r8.internal.Hm:
+com.android.tools.r8.utils.structural.HasherWrapper -> com.android.tools.r8.internal.Cm:
     java.lang.Object hash() -> a
     void putBoolean(boolean) -> a
     void putBytes(byte[]) -> a
@@ -125990,7 +125579,7 @@
     void putLong(long) -> a
     java.lang.String hashCodeAsString() -> b
     1:1:com.android.tools.r8.utils.structural.HasherWrapper sha256Hasher():33:33 -> c
-com.android.tools.r8.utils.structural.HasherWrapper$HasherWrapped -> com.android.tools.r8.internal.Gm:
+com.android.tools.r8.utils.structural.HasherWrapper$HasherWrapped -> com.android.tools.r8.internal.Bm:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.hash.Hasher):44:45 -> <init>
     1:1:void putBoolean(boolean):50:50 -> a
@@ -126001,7 +125590,7 @@
     6:6:void putBytes(byte[]):75:75 -> a
     7:7:java.lang.Object hash():81:81 -> a
     1:1:java.lang.String hashCodeAsString():86:86 -> b
-com.android.tools.r8.utils.structural.HashingVisitor -> com.android.tools.r8.internal.Lm:
+com.android.tools.r8.utils.structural.HashingVisitor -> com.android.tools.r8.internal.Gm:
     1:1:void <init>():16:16 -> <init>
     void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping) -> a
     void visitBool(boolean) -> a
@@ -126016,7 +125605,7 @@
     2:2:void visitDexField(com.android.tools.r8.graph.DexField):44:44 -> a
     3:3:void visitDexMethod(com.android.tools.r8.graph.DexMethod):48:48 -> a
     4:4:void visitDexReference(com.android.tools.r8.graph.DexReference):52:52 -> a
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Nm:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Im:
     com.android.tools.r8.utils.structural.HasherWrapper hash -> a
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:3:void <init>(com.android.tools.r8.utils.structural.HasherWrapper,com.android.tools.r8.utils.structural.RepresentativeMap):34:36 -> <init>
@@ -126030,7 +125619,7 @@
     8:8:void visitDexType(com.android.tools.r8.graph.DexType):71:71 -> a
     9:9:void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):76:76 -> a
     10:11:void visitItemIterator(java.util.Iterator,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):81:82 -> a
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.Mm:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.Hm:
     java.lang.Object item -> b
     com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence parent -> a
     boolean $assertionsDisabled -> c
@@ -126056,7 +125645,7 @@
     5: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):86 -> b
     1:3:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withShortArray(java.util.function.Function):143:145 -> i
     1:3:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):86 -> i
-com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.OK:
+com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.EK:
     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 maxIgnoreNull(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):45:45 -> a
@@ -126068,13 +125657,13 @@
     2:2:boolean isLessThan(java.lang.Object):49:49 -> c
     1:1: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.NK:
+com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.DK:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.GS:
+com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.wS:
     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.kX:
-com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.mX:
+com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.aX:
+com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.cX:
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
     1:1:int compareTo(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> a
     2:2:int compareWithTypeEquivalenceTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.RepresentativeMap):39:39 -> a
@@ -126086,13 +125675,13 @@
     8:8:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):76:76 -> a
     1:1:int compareTo(java.lang.Object):7:7 -> compareTo
     com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping() -> n
-com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.lX:
+com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.bX:
     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.mX$a:
+com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.cX$a:
     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.nX:
+com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.dX:
     void apply(com.android.tools.r8.utils.structural.StructuralSpecification) -> a
-com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.oX:
+com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.eX:
     1:1:void <init>():18:18 -> <init>
     boolean lambda$withCustomItem$0(java.lang.Object) -> a
     com.android.tools.r8.utils.structural.StructuralSpecification self() -> a
@@ -126122,13 +125711,13 @@
     1:1:com.android.tools.r8.utils.structural.StructuralSpecification withItemIterator(java.util.function.Function):83:83 -> g
     1:1:com.android.tools.r8.utils.structural.StructuralSpecification withNullableItem(java.util.function.Function):73:73 -> h
     com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function) -> i
-com.android.tools.r8.verticalclassmerging.EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Uh:
+com.android.tools.r8.verticalclassmerging.EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Ph:
     1:1:void <init>():16:16 -> <init>
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void processWorklist() -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.St:
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Lt:
     1:1:void <init>():40:40 -> <init>
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
@@ -126141,7 +125730,7 @@
     7:7:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):48:48 -> a
     8:8:boolean com.android.tools.r8.graph.GraphLens.isVerticalClassMergerLens():0:0 -> a
     8:8:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):48 -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl -> com.android.tools.r8.internal.Ut:
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl -> com.android.tools.r8.internal.Nt:
     java.util.Map worklist -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.IRCode code -> b
@@ -126161,7 +125750,7 @@
     17:17:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
     17:17:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):79 -> a
     18:18:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):79:79 -> a
-    19:19:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):235:235 -> a
+    19:19:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     19:19:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):80 -> a
     20:21:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):80:81 -> a
     22:24:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):92:94 -> a
@@ -126169,11 +125758,11 @@
     25:25:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:29:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):95:98 -> a
-    30:30:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):235:235 -> a
+    30:30:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     30:30:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):97 -> a
     31:32:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):99:100 -> a
     33:35:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):128:130 -> a
-    36:36:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):235:235 -> a
+    36:36:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     36:36:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):130 -> a
     37:40:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):131:134 -> a
     41:41:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):132:132 -> a
@@ -126183,32 +125772,34 @@
     71:71:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast.builder():50:50 -> a
     71:71:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):196 -> a
     71:71:void processWorklist():167 -> a
-    72:76:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):197:201 -> a
-    72:76:void processWorklist():167 -> a
-    77:77:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    77:77:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):201 -> a
-    77:77:void processWorklist():167 -> a
-    78:78:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):202:202 -> a
-    78:78:void processWorklist():167 -> a
-    79:97:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199:217 -> a
-    79:97:void processWorklist():167 -> a
-    98:100:void addWorklistItem(com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:182 -> a
-    101:111:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):244:254 -> a
-    112:116:boolean com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.isOperandRewrittenWithLens(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,boolean):226:230 -> a
-    112:116:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):259 -> a
-    117:121:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):260:264 -> a
-    122:122:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    122:122:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):264 -> a
-    123:123:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    123:123:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    123:123:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):264 -> a
-    124:124:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):266:266 -> a
-    125:125:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):265:265 -> a
-    126:126:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):255:255 -> a
-    127:127:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):250:250 -> a
-    128:128:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):245:245 -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.Tt:
+    72:74:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):197:199 -> a
+    72:74:void processWorklist():167 -> a
+    75:75:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    75:75:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199 -> a
+    75:75:void processWorklist():167 -> a
+    76:76:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    76:76:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    76:76:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199 -> a
+    76:76:void processWorklist():167 -> a
+    77:92:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199:214 -> a
+    77:92:void processWorklist():167 -> a
+    93:95:void addWorklistItem(com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:182 -> a
+    96:106:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):241:251 -> a
+    107:111:boolean com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.isOperandRewrittenWithLens(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,boolean):223:227 -> a
+    107:111:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):256 -> a
+    112:116:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):257:261 -> a
+    117:117:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    117:117:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):261 -> a
+    118:118:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    118:118:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    118:118:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):261 -> a
+    119:119:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):263:263 -> a
+    120:120:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):262:262 -> a
+    121:121:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):252:252 -> a
+    122:122:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):247:247 -> a
+    123:123:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):242:242 -> a
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.Mt:
     com.android.tools.r8.graph.DexType rewrittenType -> c
     com.android.tools.r8.graph.DexType originalType -> b
     int operandIndex -> a
-    1:4:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):275:278 -> <init>
+    1:4:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):272:275 -> <init>